From: Lyberta <lyberta@lyberta.net>
Date: Mon, 19 Mar 2018 15:57:43 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/FilterItemDefinition
X-Git-Tag: xonotic-v0.8.5~2207^2~1
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=39f46e8c5410727a05375a9e703fe6a6fb870241;p=xonotic%2Fxonotic-data.pk3dir.git

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

39f46e8c5410727a05375a9e703fe6a6fb870241