Merge "Fix mergeMessageFileList.php --extensions-dir extensions:skins"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Nov 2017 18:53:03 +0000 (18:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Nov 2017 18:53:03 +0000 (18:53 +0000)

Trivial merge