From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 14 Nov 2010 16:25:32 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/cuinnton_stormkeep'
X-Git-Tag: xonotic-v0.1.0preview~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7259010;p=xonotic%2Fxonotic-maps.pk3dir.git

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

725901031b83309a3577dda6fdee9d0d927bcfb7