From: Samual <samual@xonotic.org>
Date: Thu, 13 Jan 2011 15:25:05 +0000 (-0500)
Subject: Merge branch 'master' into samual/keepaway
X-Git-Tag: xonotic-v0.5.0~318^2~123^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb44cd432f64414f5fa1e1ba7154b34695ddfafc;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/keepaway
---

cb44cd432f64414f5fa1e1ba7154b34695ddfafc