Johannes Meyer 7aae291f69 Merge branch 'master' into feature/setup-wizard-7163		2014-11-12 10:08:28 +01:00
..
clicommands	CLI/monitoring/list: fix DataView-related exception	2014-07-31 17:24:56 +02:00
controllers	Merge branch 'master' into bugfix/drop-zend-config-7147	2014-11-07 14:07:15 +01:00
forms	Merge branch 'master' into feature/setup-wizard-7163	2014-11-12 10:08:28 +01:00
locale	Fix spelling mistake: Unandled -> Unhandled	2014-09-05 23:42:49 +02:00
views	helpers/MonitoringState: translate 'since'	2014-11-12 09:13:49 +01:00