From: Freddy <schro.sb@gmail.com>
Date: Wed, 7 Mar 2018 13:46:01 +0000 (+0100)
Subject: Merge branch 'master' into DefaultUser/trigger_cleanup
X-Git-Tag: xonotic-v0.8.5~2176^2~38
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=48d21b537ad85a66c05076afde4c33615da868b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/trigger_cleanup
---

48d21b537ad85a66c05076afde4c33615da868b7