From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sun, 15 Mar 2015 02:42:53 +0000 (+0000)
Subject: Merge "Fix phpcs errors and warnings in includes/json"
X-Git-Tag: 1.31.0-rc.0~12093
X-Git-Url: http://git.cyclocoop.org/%28%5B%5E/404?a=commitdiff_plain;h=c1aa818191c0b84243a0f421880e12c92b70031f;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix phpcs errors and warnings in includes/json"
---

c1aa818191c0b84243a0f421880e12c92b70031f