From: Mario <zacjardine@y7mail.com>
Date: Thu, 11 Dec 2014 23:22:03 +0000 (+1100)
Subject: Merge branch 'Mario/weapons_new'
X-Git-Tag: xonotic-v0.8.0~122
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2a0a591474681192b67caeb100f65ced41708b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapons_new'
---

b2a0a591474681192b67caeb100f65ced41708b7