From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 5 Apr 2018 20:25:56 +0000 (-0700)
Subject: Merge branch 'master' into divVerent/euclidean_fail
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9e7ede3aaebc406da6b3f0d5b92f7c13f464cb0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into divVerent/euclidean_fail
---

a9e7ede3aaebc406da6b3f0d5b92f7c13f464cb0