Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jan 2014 20:59:46 +0000 (21:59 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jan 2014 20:59:46 +0000 (21:59 +0100)

Trivial merge