Merge "HttpError: Convert line breaks in text message to <br>"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 18 Sep 2015 07:14:43 +0000 (07:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 18 Sep 2015 07:14:43 +0000 (07:14 +0000)

Trivial merge