From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 4 Apr 2017 19:09:39 +0000 (+0000)
Subject: Merge "Update composer-merge-plugin from 1.3.1 to 1.4.0"
X-Git-Tag: 1.31.0-rc.0~3617
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/pie.php?a=commitdiff_plain;h=86c505ce9fb4523ca7b06643619dedd151a023ee;p=lhc%2Fweb%2Fwiklou.git

Merge "Update composer-merge-plugin from 1.3.1 to 1.4.0"
---

86c505ce9fb4523ca7b06643619dedd151a023ee