From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 23 Aug 2013 20:29:38 +0000 (+0000)
Subject: Merge changes I7493a329,Iaa9dd210
X-Git-Tag: 1.31.0-rc.0~18899
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=d8b36ec22b6d351b2ea7a7a0380137e0af9d6ba3;p=lhc%2Fweb%2Fwiklou.git

Merge changes I7493a329,Iaa9dd210

* changes:
  Only show prefershttps if IP can use HTTPS
  Core support for disabling HTTPS based on GeoIP
---

d8b36ec22b6d351b2ea7a7a0380137e0af9d6ba3