From: Lyberta <lyberta@lyberta.net>
Date: Sun, 18 Feb 2018 09:08:34 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eed43287c9e2fa09998b9382124ea351c185b690;p=xonotic%2Fxonotic.git

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

eed43287c9e2fa09998b9382124ea351c185b690