Merge "By default, keep users in HTTPS with wgSecureLogin"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 6 Feb 2013 15:15:16 +0000 (15:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Feb 2013 15:15:16 +0000 (15:15 +0000)
1  2 
includes/DefaultSettings.php
includes/specials/SpecialUserlogin.php

Simple merge