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

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

60f1e3301beae3dac0765d8ee8eb350ee21c8f30