From: Samual <samual@xonotic.org>
Date: Thu, 21 Apr 2011 02:17:54 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into mirceakitsune/weapon_hagar_secondary_load
X-Git-Tag: xonotic-v0.5.0~263^2~10^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=afd46d09866bb25725ff873132683890dbbca098;p=xonotic%2Fxonotic-data.pk3dir.git

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

afd46d09866bb25725ff873132683890dbbca098