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

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

d45da0d863da6f8970e79af8f418b83bf6d27833