From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 28 Jun 2012 18:03:45 +0000 (+0000)
Subject: Merge "setting to completely override server hostname"
X-Git-Tag: 1.31.0-rc.0~23204
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=a69ebb07a72153b79950cd979b6e6775a169c75c;p=lhc%2Fweb%2Fwiklou.git

Merge "setting to completely override server hostname"
---

a69ebb07a72153b79950cd979b6e6775a169c75c