Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

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

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

$items[] = array( 'title'       => "Show MySQL Database size",
                  'target'      => 'content',
                  'link'        => 'monitor/show_data.php?type=database_size',
                  'html_id' => 'database_usage');

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