Fixed merge problems in mysql_clientdb_plugin.inc.php

tbrehm

2012-01-12 4a8b7ecdf842a6ba7cdf0339067c6ed285cf60cb

 server/plugins-available/openvz_plugin.inc.php

@@ -143,6 +143,7 @@
         return;
      }
      
      exec("vzctl stop $veid");
      exec("vzctl destroy $veid");
      $app->log("Destroying OpenVZ VM: vzctl destroy $veid",LOGLEVEL_DEBUG);