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)
commit7f4e344b2404f3eb51d1facdcfaaa9f4499c4d6b
tree3eb31d3de1ed13e21cac8b06d229e7c7c4d0ae11
parent24535f19b3a3085b30b3e2f67a6b9d35dabc024e
parent605de54e111868f04978efff781408e3dc38ee73
Merge "servers => serves"
includes/DefaultSettings.php