Merge "mergeMessageFileList: Support reading extension/skin.json files"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Apr 2015 16:14:38 +0000 (16:14 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Apr 2015 16:14:38 +0000 (16:14 +0000)

Trivial merge