From: Samual <samual@xonotic.org>
Date: Tue, 28 Feb 2012 21:51:49 +0000 (-0500)
Subject: Merge remote branch 'origin/morphed/exomorphx-alphashadowfix'
X-Git-Tag: xonotic-v0.6.0~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0f640a4;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/morphed/exomorphx-alphashadowfix'
---

0f640a4bce5dd4f0d0eaee4fce75801b1e5a94b4