Merge branch 'master' into 'stable-3.1'

Marius Burkard

2016-01-30 f686264ad6d82cfaf4e401da2e259880f57bfade

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

@@ -37,4 +37,8 @@
$wb['template_nameserver_error_empty'] = 'Nameserver ist leer.';
$wb['Virtual server'] = 'Virtueller Server';
$wb['Advanced'] = 'Erweitert';
$wb["iptables_txt"] = "IP Tables";
$wb["custom_txt"] = "Custom settings";
$wb["bootorder_txt"] = "Boot order priority";
$wb["bootorder_error_notpositive"] = "Only positive integers are allowed for Boot order priority";
?>