Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2014-05-11 9b155852f4a352ddb793ac4252702170b6509c17

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

@@ -1,7 +1,7 @@
<?php
$wb['list_head_txt'] = 'OpenVZ IP addresses';
$wb['server_id_txt'] = 'Server';
$wb['ip_address_txt'] = 'IP address';
$wb['reserved_txt'] = 'Reserved';
$wb['list_head_txt'] = 'Adresses IP OpenVZ';
$wb['server_id_txt'] = 'Serveur';
$wb['ip_address_txt'] = 'Adresse IP';
$wb['reserved_txt'] = 'Reservé';
$wb['vm_id_txt'] = 'VM';
?>