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

Marius Cramer

2014-03-13 7c2179f4b8604da1167b29ffb92041cf16fc4dbc

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

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





?>
<?php


?>