Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:41:59 +0000 (14:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:41:59 +0000 (14:41 +0200)
commit9d7e3bc31cea6ee6c2d6c54ea694aeefa721a949
tree750e0fe68e118a6c2522578d9dccc8195186d3db
parent60985d33ac9b18d92d16b5657bf839c4c53de81a
parentc6e19cd428026f745a73dc1e8936bffe5374157d
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tests/tine20/Tinebase/AllTests.php
tine20/Crm/Frontend/Json.php

Change-Id: I99e0f0468b7ce55a761cd43d69ca2479e513ca90
tests/tine20/TestCase.php
tests/tine20/Tinebase/AllTests.php
tine20/Crm/Export/Pdf.php
tine20/Felamimail/Setup/setup.xml
tine20/Setup/Backend/Mysql.php
tine20/Setup/Controller.php
tine20/Tinebase/Ldap.php
tine20/Tinebase/User/ActiveDirectory.php
tine20/Tinebase/js/ExceptionHandler.js