From: Samual <samual@xonotic.org>
Date: Fri, 29 Apr 2011 05:35:24 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bd9b670cca7d94ed61720b5d5231bef96f00ef52;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
---

bd9b670cca7d94ed61720b5d5231bef96f00ef52