Merge "Remove JSONContentHandler::$contentClass"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Sep 2014 17:53:22 +0000 (17:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Sep 2014 17:53:22 +0000 (17:53 +0000)

Trivial merge