From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 12 May 2010 16:35:35 +0000 (+0200)
Subject: Merge remote branch 'origin/parasti/weaponprio'
X-Git-Tag: xonotic-v0.1.0preview~632^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73d37c2a5dfce462d6f5872055b8d461eb78219f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/parasti/weaponprio'
---

73d37c2a5dfce462d6f5872055b8d461eb78219f