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)
commitcefda97c8e35ca8f7244217639d9a62d16bd3e21
tree6eecaa804c0dbd4c52466d6781c1983a3622c365
parent9846e2558cb598b6dedcc32582d1139f9f9f1158
parent0ee7f35512fc020f18ffbced15d23ab635369f88
Merge "Changes to composer.json."