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

Marius Cramer

2014-01-23 cf646e99be232c783dcbae86e329470674772749

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

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





?>
<?php


?>