Merge "ApiResult: Add ApiResult::formatExpiry()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 11 Jan 2017 20:15:28 +0000 (20:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 11 Jan 2017 20:15:28 +0000 (20:15 +0000)

Trivial merge