From: packer <packer@none>
Date: Tue, 18 Aug 2015 23:03:31 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into packer/map-fixes
X-Git-Tag: xonotic-v0.8.1^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f5a56ba2721560d47b453dc0475d2b511f123cfe;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/master' into packer/map-fixes
---

f5a56ba2721560d47b453dc0475d2b511f123cfe