Merge branch 'mirceakitsune/weapon_hagar_secondary_load' of git://git.xonotic.org...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:51:00 +0000 (15:51 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:51:00 +0000 (15:51 +0300)

Trivial merge