From: Samual <samual@xonotic.org>
Date: Sun, 9 Jan 2011 02:22:50 +0000 (-0500)
Subject: Merge remote branch 'origin' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3d64cafffeacc929dddf6322d89acc12db5009d8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin' into samual/flyingspectators
---

3d64cafffeacc929dddf6322d89acc12db5009d8