Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 interface/web/monitor/lib/module.conf.php

@@ -195,6 +195,11 @@
                  'link'   => 'monitor/show_data.php?type=fail2ban',
                  'html_id' => 'fai2ban');

$items[] = array( 'title'    => "Show MongoDB-Log",
                  'target'    => 'content',
                  'link'   => 'monitor/show_data.php?type=mongodb',
                  'html_id' => 'mongodb');

$items[] = array( 'title'    => "Show IPTables",
                  'target'    => 'content',
                  'link'   => 'monitor/show_data.php?type=iptables',