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

Trivial merge