From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:26:47 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/Mirio/stormkeep'
X-Git-Tag: xonotic-v0.7.0~46
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=dace39f765b9549057953e359151b56f25fa2650;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/Mirio/stormkeep'
---

dace39f765b9549057953e359151b56f25fa2650