From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 28 Jan 2017 07:37:09 +0000 (+0000)
Subject: Merge "translateBlockExpiry: Duration is block expiry minus current time"
X-Git-Tag: 1.31.0-rc.0~4210
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=b92a207388e5efe4c7a59642973a1943c7e3ee4d;p=lhc%2Fweb%2Fwiklou.git

Merge "translateBlockExpiry: Duration is block expiry minus current time"
---

b92a207388e5efe4c7a59642973a1943c7e3ee4d