Eric Lippmann d87788b9c1 Merge branch 'master' into feature/query-interfaces-6018 ... Conflicts: modules/monitoring/library/Monitoring/Backend/Ido/Query/ContactgroupQuery.php		2014-05-06 18:45:12 +02:00
..
Icinga	Merge branch 'master' into feature/query-interfaces-6018	2014-05-06 18:45:12 +02:00
vendor	Fix colors of svg charts in Firefox	2014-03-31 12:35:39 +02:00