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)
commita69ebb07a72153b79950cd979b6e6775a169c75c
tree3879ad05764e292b1306090f08ff72251cc426d3
parent8d2b9a2a4f70b4d6b9b5db9d4f6fd4817084fac2
parent4d1324f47df62969a9ee2b69ce8ed02332aa93ce
Merge "setting to completely override server hostname"