Merge "(bug 29898) Set cookie to force HTTPS from HTTP"
authorCatrope <roan.kattouw@gmail.com>
Fri, 28 Sep 2012 17:34:26 +0000 (17:34 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 28 Sep 2012 17:34:26 +0000 (17:34 +0000)
1  2 
includes/User.php

Simple merge