Merge "Chinese Conversion Table Update 2015-7"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Sep 2015 20:23:24 +0000 (20:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Sep 2015 20:23:24 +0000 (20:23 +0000)

Trivial merge