Merge "UserTest: Don't rely on the behavior of unknown user options"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 20 Sep 2014 17:13:03 +0000 (17:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 20 Sep 2014 17:13:03 +0000 (17:13 +0000)

Trivial merge