From: Mario <zacjardine@y7mail.com>
Date: Thu, 6 Nov 2014 06:55:52 +0000 (+1100)
Subject: Merge branch 'samual/weapons' into Mario/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~25
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc84852344a61cf02dea8f6db1a1e3a2449b4253;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/weapons' into Mario/weapons
---

bc84852344a61cf02dea8f6db1a1e3a2449b4253