Merge "Remove 2 deprecated functions from class User"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 16 Dec 2016 21:06:15 +0000 (21:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 16 Dec 2016 21:06:15 +0000 (21:06 +0000)

Trivial merge