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

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

1660f0334d0c96db21a30faf30af286377141bcb