From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Oct 2017 13:23:49 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~45
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=696e813e264ec0a097c3b3921f36e7a3f7aacd27;p=xonotic%2Fxonotic-data.pk3dir.git

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

696e813e264ec0a097c3b3921f36e7a3f7aacd27