From: Lyberta <lyberta@lyberta.net>
Date: Wed, 30 Aug 2017 05:07:32 +0000 (+0300)
Subject: Merge branch 'Lyberta/URS2' into Lyberta/RandomStartWeapons
X-Git-Tag: xonotic-v0.8.5~2459^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d032c6d2d46fb6f1eab6329e75fe9f2330a42597;p=xonotic%2Fxonotic-data.pk3dir.git

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

d032c6d2d46fb6f1eab6329e75fe9f2330a42597