From: Mirio <opivy@hotmail.de>
Date: Mon, 31 Aug 2015 11:58:02 +0000 (+0200)
Subject: Merge branch 'master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=267c9a878f50ab9dd6c7d0bfeb2d2d77d42fb9fc;p=xonotic%2Fxonotic-maps.pk3dir.git

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

267c9a878f50ab9dd6c7d0bfeb2d2d77d42fb9fc