Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:57:28 +0000 (14:57 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Sep 2016 12:57:28 +0000 (14:57 +0200)
commitce7e01a00834a272de2930cb91b118e5238dd03e
tree67ab71db23ce32b9d5aea362aa4a10ddde14bc78
parent46356e9fbdeff708240b05c55218abd6337ba0ed
parent4d83c9b32d2ada07cb2b9345fd15b840f7bb6599
Merge branch '2014.11' into 2015.11

Change-Id: Ie24f45eb7cf9febf02d5bb39b6870dc183986f9c
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tine20/Calendar/Frontend/ActiveSync.php
tine20/Calendar/Model/Attender.php
tine20/Tinebase/User.php