Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Dec 2014 15:57:50 +0000 (16:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 17 Dec 2014 15:57:50 +0000 (16:57 +0100)
commit0ad4fdbf487ee9e792e8cf28b320aae60ab1cf2b
treeb6ad13910b6ff435c1462c8005bad6aafba7fcd9
parentbf6bd3b67f5f0b501235c2f99f7cff2c28e7cc49
parentaa1ba09f4411a778268a3b3a6ba94aaa3e5e3963
Merge branch '2013.10' into 2014.11
tests/tine20/ActiveSync/Command/SyncTests.php
tine20/ActiveSync/Frontend/Abstract.php
tine20/ActiveSync/Server/Http.php
tine20/Calendar/Frontend/Cli.php
tine20/Tinebase/Config.php
tine20/Tinebase/Core.php
tine20/Tinebase/User.php