From: Lyberta <lyberta@lyberta.net>
Date: Sat, 17 Feb 2018 06:39:39 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=82e58e967b0e2ed93b6638ad9bccdbc6e7fceb67;p=xonotic%2Fxonotic.git

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

82e58e967b0e2ed93b6638ad9bccdbc6e7fceb67