Merge "mediawiki.cookie: Re-add documentation about non-zero default expiration"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 24 Jan 2015 01:32:48 +0000 (01:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 24 Jan 2015 01:32:48 +0000 (01:32 +0000)

Trivial merge