From: Mirio <opivy@hotmail.de>
Date: Mon, 16 Mar 2015 14:18:46 +0000 (+0100)
Subject: Merge branch 'master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57e94b05fd7ebe7da50775f866673057f0e3f123;p=xonotic%2Fxonotic-maps.pk3dir.git

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

57e94b05fd7ebe7da50775f866673057f0e3f123