From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 1 May 2011 12:51:00 +0000 (+0300)
Subject: Merge branch 'mirceakitsune/weapon_hagar_secondary_load' of git://git.xonotic.org... 
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=59c257eff12dbe51d08f3913b8c73102e3478a6e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mirceakitsune/weapon_hagar_secondary_load' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/weapon_hagar_secondary_load
---

59c257eff12dbe51d08f3913b8c73102e3478a6e