Eric Lippmann 82ee1d6e60 Merge branch 'master' into bugfix/significant-whitespaces-8777
Conflicts:
	library/Icinga/Web/Widget/FilterEditor.php
2015-05-18 13:35:28 +02:00
..
2015-04-08 09:31:11 +02:00
2015-03-12 16:08:47 +01:00
2015-05-15 14:37:41 +02:00
2015-05-15 14:37:41 +02:00