From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 10 Jan 2015 01:36:53 +0000 (+0000)
Subject: Merge "maintenance: Have update-oojs-ui.sh update composer.json too"
X-Git-Tag: 1.31.0-rc.0~12728
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=52f159a69bef80978465c28adb70ad8dceff23c9;p=lhc%2Fweb%2Fwiklou.git

Merge "maintenance: Have update-oojs-ui.sh update composer.json too"
---

52f159a69bef80978465c28adb70ad8dceff23c9