From: Mario <mario@smbclan.net>
Date: Wed, 22 Aug 2018 08:05:21 +0000 (+1000)
Subject: Merge branch 'master' into morphed/energyweapons
X-Git-Tag: xonotic-v0.8.5~1922^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=21d066a6d9db0539908d0d05ced5d34b6375bdb1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into morphed/energyweapons
---

21d066a6d9db0539908d0d05ced5d34b6375bdb1