Merge branch 'florian030/ispconfig3-master' into stable-3.1

Marius Burkard

2016-06-14 1ec27d7366ac58df1d2d8cfc426be2c33d9cfa2c

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

@@ -37,6 +37,9 @@
$wb['template_nameserver_error_empty'] = 'Nameserver(i) polje je prazno.';
$wb['Virtual server'] = 'Virtualni server';
$wb['Advanced'] = 'Napredno';
$wb['features_txt'] = 'Features';
$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';
?>