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

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

1360df863d4818253cca208afc2c3f09378ce0e7