From: Lyberta <lyberta@lyberta.net>
Date: Mon, 26 Mar 2018 14:58:17 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=321b45944efda79d9e82369f5e6d3c9bc15c089b

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

321b45944efda79d9e82369f5e6d3c9bc15c089b