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

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

95e0829391f2fd81a50c8d94e63305dd525a3433