Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:16:57 +0000 (18:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 4 Aug 2015 16:16:57 +0000 (18:16 +0200)
commitf15768001e80026a62698b941a28eece446c2379
treeb74705238ebec412f710e47c71a2ae1da0cab5af
parent3f6e652ee9135261bac5a3145db6a5a03b50cb5f
parentb63fde259de1c70de76028435803ed26d311c4e9
Merge branch '2013.10' into 2014.11
tine20/Tinebase/Auth.php
tine20/Tinebase/Ldap.php
tine20/Tinebase/User.php