Merge "Special:Block: Disallow to add an expiry time in the past"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 14 Jan 2016 19:03:18 +0000 (19:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jan 2016 19:03:18 +0000 (19:03 +0000)

Trivial merge