Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:29:37 +0000 (15:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:29:37 +0000 (15:29 +0100)
commitffa794ed7a81d034342f248350431f95a841c3c5
treedb943f00545a4a519caf5094b066d915f12b5318
parent86dc2d1e1ca04ab2bf793850d2b5f3e4db66d9a0
parent4519ca85b6373b6073f9162f763a929573fb0ff8
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Controller/RecurTest.php
tine20/Calendar/Setup/setup.xml

Change-Id: I2ba9af2c9b5d45b7df8814b4afd87ce26462b839
tests/tine20/Calendar/Controller/RecurTest.php
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tine20/ActiveSync/Controller.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Frontend/ActiveSync.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml