Merged language files.

tbrehm

2011-09-22 522ef8b7cbb68e0105c2263647471ab5da922c79

 install/dist/conf/debian60.conf.php

@@ -206,10 +206,8 @@
$conf['nginx']['php_fpm_start_port'] = 9010;
$conf['nginx']['php_fpm_socket_dir'] = '/var/run/php5-fpm';

//* Ufw
$conf['ufw']['installed'] = false;
$conf['squid']['config_dir'] = '/etc/ufw';
$conf['squid']['init_script'] = 'ufw';
//* OpenVZ
$conf['openvz']['installed'] = false;

//*Bastille-Firwall
$conf['bastille']['installed'] = false;