From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 2 Nov 2010 14:42:15 +0000 (+0100)
Subject: Merge remote branch 'origin/savagex/moarfixes'
X-Git-Tag: xonotic-v0.1.0preview~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd51e74fb95b87d214f9e238c32da57c1ad4d1bf;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/savagex/moarfixes'
---

fd51e74fb95b87d214f9e238c32da57c1ad4d1bf