Merge "Do not redirect to HTTPS when it's not supported"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 31 May 2016 17:39:48 +0000 (17:39 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 31 May 2016 17:39:48 +0000 (17:39 +0000)
1  2 
includes/MediaWiki.php

Simple merge