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

Florian Schaal

2015-05-07 741aa6aa3ec188aa4f37b26dc3314e2d0cd811aa

 install/install.php

@@ -171,7 +171,7 @@
//** Get the hostname
$tmp_out = array();
exec('hostname -f', $tmp_out);
$conf['hostname']=$tmp_out[0];
$conf['hostname'] = @$tmp_out[0];
unset($tmp_out);
//** Prevent empty hostname
$check = false;
@@ -869,4 +869,4 @@
echo "Installation completed.\n";


?>
?>