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

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

fd2f195f445ee98812f24f3558e4df78412939ca