Johannes Meyer d1917ad2b4 Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632 ... Conflicts: modules/monitoring/application/views/scripts/service/history.phtml		2015-08-03 16:46:27 +02:00
..
Icinga	Merge branch 'master' into bugfix/do-not-use-count-queries-for-emptiness-checks-9632	2015-08-03 16:46:27 +02:00
vendor	Remove executable flags from some PHP libraries	2015-02-03 10:50:50 +01:00