Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 15:37:48 +0000 (17:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Jul 2013 15:37:48 +0000 (17:37 +0200)

Trivial merge