Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Sep 2013 15:14:15 +0000 (17:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 26 Sep 2013 15:14:15 +0000 (17:14 +0200)

Trivial merge