Resolved differences from svn merge to trunk and git master

Marius Cramer

2013-10-18 bd68aae78a5d696e4ccb9c0d267486c283a6d9d2

 server/lib/classes/monitor_tools.inc.php

@@ -455,6 +455,9 @@
               $logfile = '/var/log/fail2ban.log';
            }
            break;
         case 'log_mongodb':
               $logfile = '/var/log/mongodb/mongodb.log';
            break;
         case 'log_ispconfig':
            if ($dist == 'debian') {
               $logfile = $conf['ispconfig_log_dir'] . '/ispconfig.log';