From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Fri, 13 May 2011 20:11:06 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/hud_postprocessing
X-Git-Tag: xonotic-v0.5.0~173^2~3^2~9
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c0749beee99dad58e1d00ae03026a6564dea0d39

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

c0749beee99dad58e1d00ae03026a6564dea0d39