Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jan 2014 16:04:35 +0000 (17:04 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 10 Jan 2014 16:04:35 +0000 (17:04 +0100)

Trivial merge