Merge "Bump composer-merge-plugin to v1.1.0"
authorBryan Davis <bd808@wikimedia.org>
Thu, 28 May 2015 03:54:03 +0000 (03:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 May 2015 03:54:03 +0000 (03:54 +0000)

Trivial merge