From: mand1nga <mand1nga@xonotic.org>
Date: Sun, 21 Aug 2011 03:10:17 +0000 (-0300)
Subject: Merge remote-tracking branch 'origin/samual/flyingspectators'
X-Git-Tag: xonotic-v0.5.0~109
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f15ff9f0d34d7f4aff3de7542b923ef53694a0e5;p=xonotic%2Fxonotic-data.pk3dir.git

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

f15ff9f0d34d7f4aff3de7542b923ef53694a0e5