Merge "Make SpecialPreferencesTest::testBug41337 non-risky"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 27 Jun 2014 00:57:48 +0000 (00:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 27 Jun 2014 00:57:48 +0000 (00:57 +0000)

Trivial merge