Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2013-11-20 1a2cbfbf0cd666af05c28c3a7e51de3fb59bdd99

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

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





?>
<?php


?>