Merge branch 'master', remote branch 'origin'
authorSven Donath <lxo@dexo.de>
Mon, 12 Nov 2012 17:30:26 +0000 (18:30 +0100)
committerSven Donath <lxo@dexo.de>
Mon, 12 Nov 2012 17:30:26 +0000 (18:30 +0100)

Trivial merge