Merge "Fix misleading param name in FormatJson::encode signature"
authorNikerabbit <niklas.laxstrom@gmail.com>
Fri, 23 Nov 2012 22:53:07 +0000 (22:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Nov 2012 22:53:07 +0000 (22:53 +0000)

Trivial merge