From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 14:56:13 +0000 (+0100)
Subject: Merge remote branch 'origin/savagex/stormkeepfixes'
X-Git-Tag: xonotic-v0.5.0~126
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f225307cd68062a658a2e1cf57bb7e8837e1d7b;p=xonotic%2Fxonotic-maps.pk3dir.git

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

1f225307cd68062a658a2e1cf57bb7e8837e1d7b