Merge "TextContent: Document parameters to convert()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 May 2014 18:54:08 +0000 (18:54 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 May 2014 18:54:08 +0000 (18:54 +0000)

Trivial merge