Merge "Fixed deadlockLoop() IDE errors"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Aug 2015 21:41:06 +0000 (21:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Aug 2015 21:41:06 +0000 (21:41 +0000)

Trivial merge