Merge "Use deferred updates in place of $wgActivityUpdatesUseJobQueue"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Jul 2015 20:29:50 +0000 (20:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Jul 2015 20:29:50 +0000 (20:29 +0000)

Trivial merge