Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Mar 2013 13:08:55 +0000 (14:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Mar 2013 13:08:55 +0000 (14:08 +0100)
commitdc1d15ed8a676eb0c5bd5d2aaf6dbf5a16e9663c
treefa8c4c0b9d282657bcb2f76206890e3e6c6aa30b
parentcf31e65eb02674ca18d43b00d33f7d76b691ca33
parentcd723d8156b1530fe29878b2eefba50812ee5a9e
Merge branch 'tine20.com/2012.10' into 2013.03