From: mand1nga <mand1nga@xonotic.org>
Date: Sat, 30 Apr 2011 13:15:51 +0000 (-0300)
Subject: Merge branch 'master' into mirceakitsune/event_chasecam
X-Git-Tag: xonotic-v0.5.0~268^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bbdb767daf5bf379850c6c814b0e37619685be04;p=xonotic%2Fxonotic-data.pk3dir.git

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

bbdb767daf5bf379850c6c814b0e37619685be04