Merge branch 'tine20.com/2012.10' into 2013.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Apr 2013 11:31:06 +0000 (13:31 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 15 Apr 2013 11:31:06 +0000 (13:31 +0200)
commitdfe94dba8c18e2f5d764ac287251c5e2c5e6b8c2
treec89a6c796f0271b5d49eb983268d26551757637c
parent10625ac2cd5807bd12c0f64fdb22805cab3af116
parent12fd82493ab04d5b7c1fde29c99a99308e77be9d
Merge branch 'tine20.com/2012.10' into 2013.03

Conflicts:
tine20/Calendar/Setup/Update/Release6.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/Setup/Update/Release6.php
tine20/Calendar/Setup/Update/Release7.php
tine20/Calendar/Setup/setup.xml