From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 22 Jun 2015 22:00:06 +0000 (+0000)
Subject: Merge "Make proxy behaviour of detectServer() configurable"
X-Git-Tag: 1.31.0-rc.0~11014
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f8ebb995b0131259aa95c3f7e763089deb8ef182;p=lhc%2Fweb%2Fwiklou.git

Merge "Make proxy behaviour of detectServer() configurable"
---

f8ebb995b0131259aa95c3f7e763089deb8ef182