Merge "Made executeReadyPeriodicTasks avoid using merge() when not needed"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 4 Jun 2014 22:42:57 +0000 (22:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 4 Jun 2014 22:42:57 +0000 (22:42 +0000)

Trivial merge