From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 30 Oct 2010 14:45:00 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/stormkeep'
X-Git-Tag: xonotic-v0.1.0preview~68
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d53374bc0b3efb2bbe03bec332a154e9ae9c5561;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/fruitiex/stormkeep'
---

d53374bc0b3efb2bbe03bec332a154e9ae9c5561