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

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

62b33decfe83f49635c11598c5bcf781f9b26bf1