Johannes Meyer 9d292269b1 Merge branch 'master' into feature/setup-wizard-7163
Conflicts:
	application/forms/Config/Resource/LdapResourceForm.php
	test/php/application/forms/Config/Authentication/LdapBackendFormTest.php
2014-11-11 09:44:11 +01:00
..
2014-09-04 14:00:48 +02:00
2014-10-15 15:46:07 +02:00
2014-09-24 10:46:35 +02:00
2014-09-05 11:40:43 +02:00