From: Lyberta <lyberta@lyberta.net>
Date: Mon, 16 Oct 2017 14:04:26 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems
X-Git-Tag: xonotic-v0.8.5~2426^2~17
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1a02dfa42534cfd8697e6c4d0e1181e5ec6c1fc7;p=xonotic%2Fxonotic-data.pk3dir.git

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

1a02dfa42534cfd8697e6c4d0e1181e5ec6c1fc7