Merge branch 'master', remote branch 'origin'
authorSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 11:09:32 +0000 (13:09 +0200)
committerSven Donath <lxo@dexo.de>
Thu, 18 Oct 2012 11:09:32 +0000 (13:09 +0200)
commit6a268229744c1a25a9c33f44bc2e4bc8c041bc14
tree6ba8fef771296a0bb9cbf03966a6d32c6e7672ff
parentcc61cdefcf47c54ebc4c7f94702952823057c209
Merge branch 'master', remote branch 'origin'