From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Sep 2017 06:33:18 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomStartWeapons
X-Git-Tag: xonotic-v0.8.5~2459^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3cd932a2030bbb989c54d3def6c19f6204c2dad0;p=xonotic%2Fxonotic-data.pk3dir.git

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

3cd932a2030bbb989c54d3def6c19f6204c2dad0