Merge "Allow callers to load user objects from slaves if desired"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 24 Mar 2015 19:12:23 +0000 (19:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 24 Mar 2015 19:12:23 +0000 (19:12 +0000)

Trivial merge