Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Feb 2014 16:11:08 +0000 (17:11 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 27 Feb 2014 16:11:08 +0000 (17:11 +0100)
commitc05404a30b7e526ca1f999b7ddb1b2c5c6b2f055
tree94725872ec19e6ddc94f800fd781622be275fe36
parent4b739aa0fae06a92036c32a30708abde0a18d3d8
parentc17c6759a6c3ea21162e56c03f30f698961fd4ad
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Calendar/Config.php
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Config.php
tine20/Setup/Frontend/Cli.php