Merge "Shorten long lines and use consistent tabs in DefaultSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 3 Mar 2015 22:16:39 +0000 (22:16 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 3 Mar 2015 22:16:39 +0000 (22:16 +0000)
1  2 
includes/DefaultSettings.php

Simple merge