Fixed merge problems in mysql_clientdb_plugin.inc.php

tbrehm

2012-01-12 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb

 server/plugins-available/network_settings_plugin.inc.php

@@ -238,7 +238,7 @@
         }
         
      } else {
         $app->log('Network configuration disabled in server settings.',LOGLEVEL_WARN);
         $app->log('Network configuration disabled in server settings.',LOGLEVEL_DEBUG);
      }
      
   }