Merge "Avoid double escaped expiry time on action=protect"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 29 Jan 2015 20:14:37 +0000 (20:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 29 Jan 2015 20:14:37 +0000 (20:14 +0000)

Trivial merge