Merge remote-tracking branch 'ispc/master'

Marius Cramer

2015-05-21 6b1fde7e9a450ae8e4835f7e8c2ba1f398e78c1f

 interface/web/vm/lib/lang/en_openvz_vm.lng

@@ -37,4 +37,6 @@
$wb["template_nameserver_error_empty"] = 'Nameserver(s) is empty.';
$wb["Virtual server"] = 'Virtual server';
$wb["Advanced"] = 'Advanced';
?>
$wb['features_txt'] = 'Features';
$wb["iptables_txt"] = "iptables";
?>