From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Wed, 8 Jun 2011 19:47:46 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee38b5a0b6d863502744e7fdbb3e3d9a0a394147;p=xonotic%2Fxonotic-data.pk3dir.git

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

ee38b5a0b6d863502744e7fdbb3e3d9a0a394147