Merge "Add a composer.local.json-sample"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Jan 2016 20:30:57 +0000 (20:30 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Jan 2016 20:30:57 +0000 (20:30 +0000)

Trivial merge