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

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

bc3c96311eab9ac5d775a69dc0496a0d7b789284