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
..
File	Prefer Icinga\Application\Config instead of Zend_Config	2014-11-07 13:53:03 +01:00
Ldap	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-07 14:07:15 +01:00
Livestatus	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
Nrpe	Throw IcingaException rather than Exception	2014-08-27 16:03:15 +02:00
Dns.php	Make Dns::getSrvRecors being more generic	2014-10-09 10:19:21 +02:00