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)
commit781c16772f3c80cc827f11815bfb07b8318621f0
treef774201ad5fa15f753d271618597791820a6675e
parentc2f911bdbad03f7b81e0121e4e866bb96586168c
parent420cc628dce84d55be98be5f9987b13879c2010e
Merge branch 'master', remote branch 'origin'