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

root

2014-02-13 2b3f112874ad7ec2bc4da52cd51e80b039d9706d

 interface/web/designer/lib/admin.conf.php

@@ -1,4 +1,4 @@
<?php





?>
<?php


?>