Merge "mediawiki.cookie: Remove false documentation for options.expiry as number"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Jan 2015 02:24:45 +0000 (02:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Jan 2015 02:24:45 +0000 (02:24 +0000)

Trivial merge