From: Lyberta <lyberta@lyberta.net>
Date: Thu, 9 Nov 2017 16:32:18 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7aaff08fbaad9424651ec31c82f8a5d78e5ec1e1;p=xonotic%2Fxonotic-data.pk3dir.git

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

7aaff08fbaad9424651ec31c82f8a5d78e5ec1e1