Merge "setting to completely override server hostname"
authorAaron Schulz <aschulz@wikimedia.org>
Thu, 28 Jun 2012 18:03:45 +0000 (18:03 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Jun 2012 18:03:45 +0000 (18:03 +0000)

Trivial merge