Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:45:48 +0000 (10:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 29 Sep 2016 08:45:48 +0000 (10:45 +0200)
commitfe4daeb6302a968b17a5f1a022d367ce37b2cdcf
treed81fa841d33cfb7f7fe446a5732dc506e22439cb
parent31e8ee12128fe26be1314dd922d21da2fb13590b
parentc1f37a9add040aa49caf4f8d3f7eca36ddebde8e
Merge branch '2014.11' into 2015.11

Change-Id: I60c527853125a272ea7742146092a549294edd54
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tine20/Calendar/Frontend/ActiveSync.php