Merge branch 'terencehill/server_aliases_fix' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 29 Dec 2015 02:41:23 +0000 (02:41 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 29 Dec 2015 02:41:23 +0000 (02:41 +0000)
commit2487070c23bdcfc8ac60d414356ec43f52ec1a57
treea1ac226d8fa26c79aca0f9960d8e360703610046
parent4b330326dfd04c5e534090cccf6da3fc6f04cd20
parent798514277cc53aa0b84f57d92585163e1ffe87c7
Merge branch 'terencehill/server_aliases_fix' into 'master'

Server aliases fix

See merge request !271