From: Mario <zacjardine@y7mail.com>
Date: Fri, 25 Aug 2017 11:33:33 +0000 (+0000)
Subject: Merge branch 'martin-t/gunalign' into 'master'
X-Git-Tag: xonotic-v0.8.5~2509
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e57fd111a3279a4aa4789e2c72f9c819a56c7be9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/gunalign' into 'master'

Gunalign

See merge request !460
---

e57fd111a3279a4aa4789e2c72f9c819a56c7be9