Merge changes I7493a329,Iaa9dd210
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 23 Aug 2013 20:29:38 +0000 (20:29 +0000)
commitd8b36ec22b6d351b2ea7a7a0380137e0af9d6ba3
treeaaee0d7be221977418b76bc5ff2d546df7414a1d
parente63ea41f5512747e9c78b56c669f13abbe9c4198
parent9e7693c749a90646052c82a660845314226446c3
Merge changes I7493a329,Iaa9dd210

* changes:
  Only show prefershttps if IP can use HTTPS
  Core support for disabling HTTPS based on GeoIP
includes/Preferences.php
includes/specials/SpecialUserlogin.php