From: Lyberta <lyberta@lyberta.net>
Date: Tue, 24 Oct 2017 20:02:44 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d5176859998b4f2a20b13a629fd7b5e5df5eb58b;p=xonotic%2Fxonotic-data.pk3dir.git

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

d5176859998b4f2a20b13a629fd7b5e5df5eb58b