From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 9 Sep 2016 08:29:15 +0000 (+0000)
Subject: Merge "JsonContentHandler: Make sure makeEmptyContent() is valid JSON"
X-Git-Tag: 1.31.0-rc.0~5680
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=d908ac0d44a5c41eac292faaed68b7d39a6165f5;p=lhc%2Fweb%2Fwiklou.git

Merge "JsonContentHandler: Make sure makeEmptyContent() is valid JSON"
---

d908ac0d44a5c41eac292faaed68b7d39a6165f5