From: terencehill <piuntn@gmail.com>
Date: Sun, 25 Feb 2018 01:16:00 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/accuracy_shotgun
X-Git-Tag: xonotic-v0.8.5~2281^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd4a23ef1c7bac69cd8f09b604b022f5f9f6fe28;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/accuracy_shotgun
---

dd4a23ef1c7bac69cd8f09b604b022f5f9f6fe28