Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 May 2013 12:07:34 +0000 (14:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 21 May 2013 12:07:34 +0000 (14:07 +0200)

Trivial merge