From: Lyberta <lyberta@lyberta.net>
Date: Wed, 6 Jun 2018 00:45:24 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/mutator_is_enabled
X-Git-Tag: xonotic-v0.8.5~2108^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cdfb5ccac250aac0633253e0f384e01f56a55bb6;p=xonotic%2Fxonotic-data.pk3dir.git

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

cdfb5ccac250aac0633253e0f384e01f56a55bb6