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

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

624acc7330757b4a993e263763eced27f475c4f7