Merge "mediawiki.js: Fix docucumentation breakage"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 29 Oct 2013 09:42:05 +0000 (09:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 29 Oct 2013 09:42:05 +0000 (09:42 +0000)

Trivial merge