Ultra2D 6f299a9679 Merge remote-tracking branch 'upstream/master' into issue-714 ...

Conflicts:
	html/includes/authentication/ldap.inc.php

2015-04-08 08:43:24 +02:00

..

http-auth.inc.php

…

ldap.inc.php

…

mysql.inc.php

…

twofactor.lib.php

…