Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Nov 2013 14:07:33 +0000 (15:07 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Nov 2013 14:07:33 +0000 (15:07 +0100)

Trivial merge