Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Feb 2014 12:19:55 +0000 (13:19 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 10 Feb 2014 12:19:55 +0000 (13:19 +0100)
commitf4d4d61344b816c9fdec7fbc23db02f5eb4a5e8d
tree11f509c13c0b72d4c3b929cd0be93afb14c1700b
parentb45fd5c225e10b7e464b2adb6579d8b8a517c42a
parent883177d2675aaa4d872cac84424c9ad06f6c4b25
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Tinebase/Setup/Update/Release7.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/User/Sql.php