Merge "Bump wikimedia/composer-merge-plugin to 1.2.0"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000 (21:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 26 Jun 2015 21:11:01 +0000 (21:11 +0000)

Trivial merge