Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 May 2013 12:08:02 +0000 (14:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 May 2013 12:08:02 +0000 (14:08 +0200)

Trivial merge