Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Mar 2013 10:18:28 +0000 (11:18 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 4 Mar 2013 10:18:28 +0000 (11:18 +0100)

Trivial merge