Merge "Remove vestiges of AdminSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 30 Jan 2014 19:05:39 +0000 (19:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 30 Jan 2014 19:05:39 +0000 (19:05 +0000)

Trivial merge