From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 22 Apr 2011 15:39:33 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37401b9357fb6a62dfde7f359920c6a26572ad66;p=xonotic%2Fxonotic-data.pk3dir.git

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

37401b9357fb6a62dfde7f359920c6a26572ad66