From: Lyberta <lyberta@lyberta.net>
Date: Sun, 2 Apr 2017 09:26:13 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=58e70c60698c28455351a46b20b45913768d0edb;p=xonotic%2Fxonotic.git

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

58e70c60698c28455351a46b20b45913768d0edb