Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Dec 2014 15:41:09 +0000 (16:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Dec 2014 15:41:09 +0000 (16:41 +0100)
commit95a49f96177310a6696f0012f1cba35c8e82f166
tree556e316fc45546dad0c4a6884038d24185e643b6
parent84a78c622e2584bbca06f265a204034a03b6a0d6
parentd88a23806e67b8d49ddd22bfea75164e84ce16c0
Merge branch '2013.10' into 2014.11
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Backend/Sql.php
tine20/Tinebase/Frontend/Http/Abstract.php
tine20/Tinebase/Server/Http.php