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

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

ab866f5b9b03d805aed5da8fe00e9ab51b7acf8f