From: Lyberta <lyberta@lyberta.net>
Date: Sun, 27 Aug 2017 22:54:21 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomStartWeapons
X-Git-Tag: xonotic-v0.8.5~2459^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=65b54b5967f0a152ff308a37196a583e816c1f72;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/RandomStartWeapons
---

65b54b5967f0a152ff308a37196a583e816c1f72