Merge "Make LocalPasswordPrimaryAuthenticationProviderTest use TS_MW timestamp conver...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 May 2017 18:32:10 +0000 (18:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 May 2017 18:32:10 +0000 (18:32 +0000)

Trivial merge