Merge "Removed clearSharedCache() hack in User.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Sep 2015 12:13:12 +0000 (12:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Sep 2015 12:13:12 +0000 (12:13 +0000)

Trivial merge