From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 30 Dec 2010 19:22:48 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/stormkeep'
X-Git-Tag: xonotic-v0.5.0~123
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=b726765

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

b72676508614c6ec9a3cf93e6d54072fe937cb99