Eric Lippmann 7cfc78558d Merge branch 'master' into feature/secure-modules-9644 ... Conflicts: library/Icinga/Exception/IcingaException.php		2015-07-28 13:42:02 +02:00
..
Application	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Chart	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Data	Merge branch 'master' into feature/user-and-group-management-8826	2015-05-19 14:14:03 +02:00
File	IniWriterTest: Remove forgotten var_dump()	2015-06-23 16:59:55 +02:00
Logger/Writer	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Protocol/Ldap	Ldap\Connection: Rename to LdapConnection	2015-06-24 09:05:29 +02:00
Test	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
User	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
Util	Drop the DateTimeFactoryTest	2015-05-19 11:27:56 +02:00
Web	Merge branch 'master' into feature/secure-modules-9644	2015-07-28 13:42:02 +02:00
UserTest.php	User: Consider the required permission more important if it has a wildcard	2015-06-02 12:01:02 +02:00