From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 11 Jul 2014 21:17:45 +0000 (+0000)
Subject: Merge "Note that jquery.json will be removed in 1.25"
X-Git-Tag: 1.31.0-rc.0~14986
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=6a707a11fa2b24b273c4bbddc17d24da2ca01cbf;p=lhc%2Fweb%2Fwiklou.git

Merge "Note that jquery.json will be removed in 1.25"
---

6a707a11fa2b24b273c4bbddc17d24da2ca01cbf