Merge "Use $wgSecureCookie to decide whether to actually mark secure cookies as ...
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 25 Jan 2016 20:11:18 +0000 (20:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 25 Jan 2016 20:11:18 +0000 (20:11 +0000)

Trivial merge