From: Samual <samual@xonotic.org>
Date: Thu, 19 May 2011 00:08:59 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7204ed4f20ffc2ac138f4adf278de52128529fe6;p=xonotic%2Fxonotic-data.pk3dir.git

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

7204ed4f20ffc2ac138f4adf278de52128529fe6