From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 17 Jul 2010 00:31:29 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/death_unglow
X-Git-Tag: xonotic-v0.1.0preview~434^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=917c4d99d8e9328dcd93fd4c4c3dc89f4579c1b0;p=xonotic%2Fxonotic-data.pk3dir.git

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

917c4d99d8e9328dcd93fd4c4c3dc89f4579c1b0