Merge "Also redirect if prefixed https cookie is preset"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 1 Sep 2013 16:41:07 +0000 (16:41 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 1 Sep 2013 16:41:07 +0000 (16:41 +0000)

Trivial merge