Merge "Document mw.user.options and mw.user.tokens properties"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 19 Dec 2015 18:07:23 +0000 (18:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 19 Dec 2015 18:07:23 +0000 (18:07 +0000)

Trivial merge