Merge "Avoid Database::encodeExpiry, when simple timestamp is given"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Nov 2013 20:39:09 +0000 (20:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Nov 2013 20:39:09 +0000 (20:39 +0000)

Trivial merge