Merge "Combine JavaScript and JSON encoding logic"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Mar 2013 01:19:53 +0000 (01:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Mar 2013 01:19:53 +0000 (01:19 +0000)

Trivial merge