Merge branch 'develop'

sylvainraye · sylvainraye · commit efb1713d93d2 · 2015-08-12T10:14:15.000+02:00
* develop:
  Fixed ACLs
diff --git a/app/code/community/Hackathon/MageMonitoring/etc/adminhtml.xml b/app/code/community/Hackathon/MageMonitoring/etc/adminhtml.xml
@@ -36,11 +36,11 @@
         <resources>
             <admin>
                 <children>
-                    <magemonitoring translate="label" module="magemonitoring">
-                        <title>Magento Monitoring</title>
-                    </magemonitoring>
                     <system>
                         <children>
+                            <magemonitoring translate="label" module="magemonitoring">
+                                <title>Magento Monitoring</title>
+                            </magemonitoring>
                             <config>
                                 <children>
                                     <magemonitoring translate="label" module="magemonitoring">
