Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:16:33 +0000 (12:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Apr 2016 10:16:33 +0000 (12:16 +0200)
commite166e2c48f1e82cfd251b47032ea7fd8827b6ed7
treeaa904daeedf242d341b07f5b49d66f0495588526
parentec6b1be54b1374f3383bf50dc1ccf17c3c90c3ef
parent47cf4981f142f529066177d94134d25e1bffb04d
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tests/tine20/Tinebase/ControllerTest.php

Change-Id: Ia366fe87ea514e6f879c6b654432da04c1f6ae0e
tests/tine20/Tinebase/ControllerTest.php