Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Apr 2014 10:05:12 +0000 (12:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 23 Apr 2014 10:05:12 +0000 (12:05 +0200)

Trivial merge