Merge "DiffFormatter: Don't mess with PHP output buffering"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 11 Feb 2016 00:31:57 +0000 (00:31 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 11 Feb 2016 00:31:57 +0000 (00:31 +0000)

Trivial merge