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

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

4ea08d72371a3e1b4d62c0ebdef587fc22e9a96f