From: Samual <samual@xonotic.org>
Date: Mon, 16 May 2011 17:38:53 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad2a02870d321031343f94bee328392c7156bafb;p=xonotic%2Fxonotic-data.pk3dir.git

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

ad2a02870d321031343f94bee328392c7156bafb