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)
commitf6f8d93fe422a2c4c0cd0d93cb59a4d5bd56a760
treeb268150996d911d61d4d0bc7f2efe6264322887c
parentc384b07719e22922a8b636e3532d44c5530b1236
parent7883e98e5b928860e8573a15317dc8af4a84cd04
Merge branch '2015.11' into 2015.11-develop

Conflicts:
tine20/Tinebase/Core.php

Change-Id: I93ec1d66b8324c804db4d1e26955128527946790
tine20/Tinebase/Core.php