Merge "JsonContentHandler: Make sure makeEmptyContent() is valid JSON"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 Sep 2016 08:29:15 +0000 (08:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Sep 2016 08:29:15 +0000 (08:29 +0000)

Trivial merge