Eric Lippmann 942d55c0d4 Merge branch 'master' into bugfix/Improve-tooltip-descriptions-8110		2015-02-02 16:37:03 +01:00
..
clicommands	Ensure that Zend is loaded when showing status information in the CLI	2014-12-09 15:38:13 +01:00
controllers	monitoring: Fix exception in the alert summary report when using the "One month" interval	2015-02-02 14:28:47 +01:00
forms	monitoring/security: Fix that toggling instance features is always disabled	2015-01-30 10:47:02 +01:00
locale	Update pt_BR translation	2014-12-03 09:40:52 -02:00
views	Merge branch 'master' into bugfix/Improve-tooltip-descriptions-8110	2015-02-02 16:37:03 +01:00