Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Apr 2013 09:12:25 +0000 (11:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Apr 2013 09:12:25 +0000 (11:12 +0200)

Trivial merge