From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 19 Apr 2011 21:56:26 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bccfb396e18cb0cd10ec150263d892415a23e3f3;p=xonotic%2Fxonotic-data.pk3dir.git

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

bccfb396e18cb0cd10ec150263d892415a23e3f3