From: Rudolf Polzer <divVerent@xonotic.org>
Date: Wed, 31 Aug 2011 13:47:53 +0000 (+0200)
Subject: Merge remote branch 'origin/terencehill/weapon_stay_fix'
X-Git-Tag: xonotic-v0.5.0~14^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7ed5fe55847a986ea514113e64cc78d6a00cf7e2;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/weapon_stay_fix'
---

7ed5fe55847a986ea514113e64cc78d6a00cf7e2