Eric Lippmann 8e3394fd55 Merge branch 'master' into feature/redesign-7144		2014-11-11 13:54:13 +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	Backend/Config: Add shortlink to resource	2014-11-07 14:20:47 +01:00
locale	Fix spelling mistake: Unandled -> Unhandled	2014-09-05 23:42:49 +02:00
views	Merge branch 'master' into feature/redesign-7144	2014-11-11 13:54:13 +01:00