From: Mirio <opivy@hotmail.de>
Date: Fri, 6 Mar 2015 22:40:55 +0000 (+0100)
Subject: Merge branch 'master' into debugger/go
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=42f995b5d3d993969bcc86809d602422769ea6bf;p=xonotic%2Fxonotic-maps.pk3dir.git

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

42f995b5d3d993969bcc86809d602422769ea6bf