Merge "Allow two-tier setup of transwiki import sources"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 19 Aug 2014 18:35:55 +0000 (18:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 19 Aug 2014 18:35:55 +0000 (18:35 +0000)
1  2 
languages/i18n/en.json
languages/i18n/qqq.json
resources/Resources.php

Simple merge
Simple merge
Simple merge