Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 3 May 2013 13:20:06 +0000 (15:20 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 3 May 2013 13:20:06 +0000 (15:20 +0200)

Trivial merge