Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Jan 2014 11:53:41 +0000 (12:53 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Jan 2014 11:53:41 +0000 (12:53 +0100)
commit541fb771c7466f4cdc14502bafffcba719f33e47
treea89ae46af168086f386f7a2dbe29f38e5f4c1380
parent08b8e81e8c7cb07f18d083aea8cf2d96671f2619
parent58c4f6bd1322f9d4fac1408058f48124a3ab0c0b
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Tinebase/Helper.php
tests/setup/Setup/AllTests.php
tine20/Setup/Frontend/Cli.php
tine20/Tinebase/Helper.php
tine20/Tinebase/js/ExceptionHandler.js