Merge remote branch 'revans/master'
authorFlorian Baumann <flo@noqqe.de>
Tue, 2 Nov 2010 14:04:53 +0000 (15:04 +0100)
committerFlorian Baumann <flo@noqqe.de>
Tue, 2 Nov 2010 14:04:53 +0000 (15:04 +0100)

Trivial merge