From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 29 Dec 2015 02:41:23 +0000 (+0000)
Subject: Merge branch 'terencehill/server_aliases_fix' into 'master'
X-Git-Tag: xonotic-v0.8.2~1366
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2487070c23bdcfc8ac60d414356ec43f52ec1a57;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/server_aliases_fix' into 'master'

Server aliases fix



See merge request !271
---

2487070c23bdcfc8ac60d414356ec43f52ec1a57