Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Mar 2013 14:18:18 +0000 (15:18 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 5 Mar 2013 14:18:18 +0000 (15:18 +0100)

Trivial merge