Johannes Meyer 1d6ad6df21 Merge branch 'master' into feature/custom-menu-items-5600 ... Conflicts: modules/monitoring/configuration.php		2015-09-15 13:31:30 +02:00
..
Color.php	…
ConfigAwareFactory.php	…
Dimension.php	…
EnumeratingFilterIterator.php	…
File.php	…
Format.php	…
String.php	…
TimezoneDetect.php	…
Translator.php	…