Merge branch 'master' into 'master'

Marius Cramer

2015-07-20 1f50209744f36c1602b11a3787dacfd3ea76527e

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

@@ -37,5 +37,5 @@
$wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
$wb['Virtual server'] = 'Virtueller Server';
$wb['Advanced'] = 'Erweitert';
$wb["iptables_txt"] = "iptables";
$wb["iptables_txt"] = "IP Tables";
?>