From: Samual <samual@xonotic.org>
Date: Fri, 29 Apr 2011 05:39:58 +0000 (-0400)
Subject: Merge branch 'mirceakitsune/event_chasecam' of ssh://git.xonotic.org/xonotic-data... 
X-Git-Tag: xonotic-v0.5.0~268^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=75e5c4bff60424203dd141483fc6706c0552c92d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mirceakitsune/event_chasecam' of ssh://git.xonotic.org/xonotic-data.pk3dir into mirceakitsune/event_chasecam
---

75e5c4bff60424203dd141483fc6706c0552c92d