From: Rudolf Polzer <divVerent@xonotic.org>
Date: Fri, 26 Nov 2010 23:58:18 +0000 (+0100)
Subject: Merge remote branch 'origin/fruitiex/stormkeep'
X-Git-Tag: xonotic-v0.1.0preview~24
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=36a9f8f6f7435ad0a417a3b5af50c976ff91d402

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

36a9f8f6f7435ad0a417a3b5af50c976ff91d402