Merge "Ensure that expiry times are given as integers"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Aug 2014 18:10:39 +0000 (18:10 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Aug 2014 18:10:39 +0000 (18:10 +0000)

Trivial merge