Merge "Support >2 and JSON-formatted options in parser tests."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 20 Feb 2014 21:52:02 +0000 (21:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 20 Feb 2014 21:52:02 +0000 (21:52 +0000)

Trivial merge