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

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

7b19bcf9d11885e8ce9fc3dbb4f2ceb47dc7087f