From: Lyberta <lyberta@lyberta.net>
Date: Sun, 10 Jun 2018 04:36:35 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/RandomItems2
X-Git-Tag: xonotic-v0.8.5~2089^2
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=eaf526ab1006ff1439082ecc7b73795cd9de9027;p=xonotic%2Fxonotic-data.pk3dir.git

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

eaf526ab1006ff1439082ecc7b73795cd9de9027