Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 18 May 2016 12:39:47 +0000 (14:39 +0200)
commitc6e19cd428026f745a73dc1e8936bffe5374157d
treeee7211187c34f9099b21a1fe1c1f251d96852905
parentd1c25230cc46d48cb051e227a8b5b6756d1ffb5c
parent7525c580c8d47fa98cbbffab192925ad03689f56
Merge branch '2014.11' into 2015.11
tests/tine20/Tinebase/AllTests.php
tine20/Admin/Controller/User.php
tine20/Tinebase/User/ActiveDirectory.php