Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:22 +0000 (12:14 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 10:14:22 +0000 (12:14 +0200)
Conflicts:
tine20/Tinebase/Core.php

Change-Id: I93ec1d66b8324c804db4d1e26955128527946790

1  2 
tine20/Tinebase/Core.php

Simple merge