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

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

cadbdcd4df344354ea6526b6d0a3b058b437bf34