Merge "generateJsonI18n.php: replace i18n.php with a shim"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 23 Dec 2013 11:25:28 +0000 (11:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 23 Dec 2013 11:25:28 +0000 (11:25 +0000)

Trivial merge