From: Lyberta <lyberta@lyberta.net>
Date: Wed, 22 Aug 2018 10:34:25 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/Fraglimit
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FLyberta%2FFraglimit;p=xonotic%2Fxonotic-data.pk3dir.git

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

ef39cad2a88cddc4752cc7b59c3a32bee71bc6c0