Merge branch 'master', remote branch 'origin'
authorSven Donath <lxo@dexo.de>
Thu, 25 Oct 2012 15:21:37 +0000 (17:21 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 25 Oct 2012 15:21:37 +0000 (17:21 +0200)
commitc2f911bdbad03f7b81e0121e4e866bb96586168c
treee3e239de840e0b9ab997cd9a35b05ff80a756663
parent1245145122f88aff6cdc86eb55b4d092a21db4f3
Merge branch 'master', remote branch 'origin'