Merge "Remove buggy b/c logic in Parser::disableCache()/updateCacheExpiry()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Oct 2015 20:30:20 +0000 (20:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Oct 2015 20:30:20 +0000 (20:30 +0000)

Trivial merge