Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:41:52 +0000 (15:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 20 Jan 2016 14:41:52 +0000 (15:41 +0100)
commitf3c2daa0dcb065501546bd7b7c3795fd2da4a2d6
tree9de2af523b43eeb30bc1c5afa29c496b3f2bd8f4
parentb1f62c95960e033c530e38f9f1f1a579cdb1974b
parent326474dd6699cc6721931ff69543000ad0913078
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml

Change-Id: I0e9f8458c1ab9a40b7390b46ad8a2ec8e4da7c8a
tests/tine20/Calendar/Frontend/ActiveSyncTest.php
tests/tine20/Felamimail/Frontend/ActiveSyncTest.php
tests/tine20/Tinebase/AllTests.php
tests/tine20/Tinebase/User/LdapTest.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/Update/Release9.php
tine20/Calendar/Setup/setup.xml
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Relations.php