From: Mirio <opivy@hotmail.de>
Date: Tue, 11 Apr 2017 11:15:04 +0000 (+0200)
Subject: Merge branch 'master' into debugger/hydroxon
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdebugger%2Fhydroxon;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into debugger/hydroxon
---

f702bc750ea65eac2bd67e4dbec878b045ef603b