Updating settings.php
Merge branch 'master' of git.pls-net.org:/var/cache/git/plsdrupal