Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 15 Jan 2016 13:01:35 +0000 (14:01 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 15 Jan 2016 13:01:35 +0000 (14:01 +0100)
commit9fd2630fd8a14a944dd2233aa2b4a347907004aa
treeab4389b7137fbf044974d3190f337737acafe8f2
parent60bcf7402b5a68986443f7001c12e81132867cd8
parentae9c371f2bc93725bd015fb6e1d4bed0742d602b
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/Frontend/ActiveSyncTest.php

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