Merge "(bug 42832) Fixed cookie security when not wpStickHTTPS."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 12 Dec 2012 19:05:03 +0000 (19:05 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 12 Dec 2012 19:05:03 +0000 (19:05 +0000)

Trivial merge