Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Sep 2015 15:01:44 +0000 (17:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Sep 2015 15:01:44 +0000 (17:01 +0200)
commit3486577e4433fff42a9a1c608883c77307cf16c1
tree3b70d0022c218062940e39ea3c8fcbc23ec2e94a
parent47d209003c1057f54f85ae9e05326cfc678b1539
parent1ab46112f6d8c2bf7bda895016a635d3ef69e852
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tests/tine20/Tinebase/AllTests.php
tine20/Tinebase/Core.php
tine20/Tinebase/translations/de.po

Change-Id: I82a8c5edfaf830c9a56fd39f56106dacae74f9be
tests/tine20/Tinebase/AllTests.php
tine20/Calendar/Convert/Event/Json.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Core.php
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Helper.php
tine20/Tinebase/User.php
tine20/Tinebase/translations/de.po