From: Lyberta <lyberta@lyberta.net>
Date: Tue, 29 Aug 2017 00:21:57 +0000 (+0300)
Subject: Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
X-Git-Tag: xonotic-v0.8.5~2459^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d428634a63244ac39e477e05ace3f21c0307905;p=xonotic%2Fxonotic-data.pk3dir.git

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

4d428634a63244ac39e477e05ace3f21c0307905