From: Lyberta <lyberta@lyberta.net>
Date: Sat, 2 Sep 2017 09:25:42 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/d0BuildFix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=19a11d3832205744dd5ff4020d946bbba1aa2383;p=xonotic%2Fxonotic.git

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

19a11d3832205744dd5ff4020d946bbba1aa2383