Merge "Remove uses of deprecated TestUser properties"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Jun 2016 15:48:46 +0000 (15:48 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Jun 2016 15:48:46 +0000 (15:48 +0000)

Trivial merge