From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 10 May 2011 23:22:50 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/glowmod_weapons
X-Git-Tag: xonotic-v0.5.0~263^2~11^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=418183bc0df3f0868177f89b2d94252a23baea98;p=xonotic%2Fxonotic-data.pk3dir.git

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

418183bc0df3f0868177f89b2d94252a23baea98