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)
1  2 
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Backend/Sql.php
tine20/Tinebase/Frontend/Http/Abstract.php
tine20/Tinebase/Server/Http.php

Simple merge
Simple merge
Simple merge