From: Mirio <opivy@hotmail.de>
Date: Mon, 6 Apr 2015 16:41:48 +0000 (+0200)
Subject: Merge branch 'master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5ed8124b012724503f7e66301ca3e19f3425d610;p=xonotic%2Fxonotic-maps.pk3dir.git

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

5ed8124b012724503f7e66301ca3e19f3425d610