From: Samual <samual@xonotic.org>
Date: Wed, 30 Mar 2011 07:34:19 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
X-Git-Tag: xonotic-v0.5.0~305^2~15^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ef3afe5cd584fb87dd45a1bc014da913d4f117a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
---

7ef3afe5cd584fb87dd45a1bc014da913d4f117a