Merge "Remove wrong type from @param on ContentHandler::merge3"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Aug 2014 06:57:42 +0000 (06:57 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Aug 2014 06:57:42 +0000 (06:57 +0000)

Trivial merge