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)
commitbf3780dc74a935d1b39cd0f25d445ffd68fd5d9c
treec9d265947ca67f4850c5fe880f2d3f650e470747
parenta8b7434fb0d5128e9f65fec855781ce77659dc23
parentc18d063dc9e6b4225e5c581437ad61963ae8c104
Merge branch 'tine20.com/2012.10' into 2013.03