Merge "merge msg script now detects extensions main files"
authorCatrope <roan.kattouw@gmail.com>
Tue, 17 Jul 2012 23:20:15 +0000 (23:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 17 Jul 2012 23:20:16 +0000 (23:20 +0000)

Trivial merge