Merge "Clarify docs for wgCookieExpiration"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 May 2014 02:38:09 +0000 (02:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 May 2014 02:38:09 +0000 (02:38 +0000)

Trivial merge