Merge "hhvm: fix FormatJsonTest::testParseTryFixing for lenient json parser"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 31 Oct 2014 17:54:01 +0000 (17:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 31 Oct 2014 17:54:01 +0000 (17:54 +0000)

Trivial merge