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

Marius Cramer

2014-01-07 ddb461f596d9f013afe4f215fabc0eabc62b1fb0

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

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





?>
<?php


?>