From: Samual <samual@xonotic.org>
Date: Mon, 14 Mar 2011 22:24:03 +0000 (-0400)
Subject: Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data... 
X-Git-Tag: xonotic-v0.5.0~309^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=18a5efa8a1e637e89f29b8719600d4cb1dd93e32;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/fixes_for_latest_merge' of ssh://git.xonotic.org/xonotic-data.pk3dir into samual/fixes_for_latest_merge
---

18a5efa8a1e637e89f29b8719600d4cb1dd93e32