Merge "servers => serves"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Mar 2013 19:48:08 +0000 (19:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Mar 2013 19:48:08 +0000 (19:48 +0000)
1  2 
includes/DefaultSettings.php

Simple merge