Merge "content: Refactor normalization of line endings code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 23 Aug 2016 18:33:34 +0000 (18:33 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 23 Aug 2016 18:33:34 +0000 (18:33 +0000)

Trivial merge