Merge remote branch 'origin/master'
authorSven Donath <lxo@dexo.de>
Tue, 20 Nov 2012 15:30:13 +0000 (16:30 +0100)
committerSven Donath <lxo@dexo.de>
Tue, 20 Nov 2012 15:30:13 +0000 (16:30 +0100)

Trivial merge