Merge "Don't force loading of groups and options on User::loadFromUserObject"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 7 Aug 2016 01:57:51 +0000 (01:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 7 Aug 2016 01:57:51 +0000 (01:57 +0000)

Trivial merge