Merge "Make proxy behaviour of detectServer() configurable"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 22 Jun 2015 22:00:06 +0000 (22:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 22 Jun 2015 22:00:06 +0000 (22:00 +0000)

Trivial merge