Merge "Simplify and cleanup maxIncludeCacheTime() code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 15 Jun 2016 22:39:50 +0000 (22:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 15 Jun 2016 22:39:50 +0000 (22:39 +0000)

Trivial merge