Merge "Avoid wfWaitForSlaves() call when in a transaction in ActiveUsers"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 15 Jul 2014 00:04:40 +0000 (00:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 15 Jul 2014 00:04:40 +0000 (00:04 +0000)

Trivial merge