Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:28:42 +0000 (14:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 3 Jul 2013 12:28:42 +0000 (14:28 +0200)

Trivial merge