From: Samual <samual@xonotic.org>
Date: Thu, 20 Jan 2011 18:50:47 +0000 (-0500)
Subject: Merge branch 'master' into samual/flyingspectators
X-Git-Tag: xonotic-v0.5.0~109^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7aad1a234787d8c6fcd042dad3ec7243e716c96c;p=xonotic%2Fxonotic-data.pk3dir.git

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

7aad1a234787d8c6fcd042dad3ec7243e716c96c