Merge "Removed maximumPeriodicTaskSeconds hack; now unused"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 26 Apr 2014 18:06:55 +0000 (18:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 26 Apr 2014 18:06:55 +0000 (18:06 +0000)

Trivial merge