Merge "Collapse duplicate $existingExpiry == 'infinity' case into else"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 16 Jun 2014 00:07:17 +0000 (00:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 16 Jun 2014 00:07:17 +0000 (00:07 +0000)

Trivial merge