Merge "Changes to composer.json."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 Feb 2013 10:40:01 +0000 (10:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Feb 2013 10:40:01 +0000 (10:40 +0000)

Trivial merge