Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Mar 2013 18:11:38 +0000 (19:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 13 Mar 2013 18:11:38 +0000 (19:11 +0100)
commitf5e6819dee65e5cdeb98c3171db6fe1c9ff920f3
treea825d2a9dcfba177abc1e7e13bc64a866d769f93
parent53245b670b4b111a9f4f9e79af5f11c83b25aec5
parent44a2d49d283b0334556d6b148f4f652eb961162d
Merge branch 'tine20.com/2012.10' into 2013.03