Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Apr 2014 09:37:11 +0000 (11:37 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Apr 2014 09:37:11 +0000 (11:37 +0200)

Trivial merge