From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 17 Dec 2011 21:38:48 +0000 (+0100)
Subject: Merge branch 'divVerent/weapon_stay_2'
X-Git-Tag: xonotic-v0.6.0~74^2~94^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=685d33ff6a00b6bc96a891ebf295b3b9eeb9c277;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'divVerent/weapon_stay_2'
---

685d33ff6a00b6bc96a891ebf295b3b9eeb9c277