Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 20:40:50 +0000 (22:40 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 20:40:50 +0000 (22:40 +0200)

Trivial merge