From: Mario <mario.mario@y7mail.com>
Date: Sun, 15 Jun 2014 04:54:31 +0000 (+1000)
Subject: Merge branch 'samual/weapons' into Mario/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=34863a007ec889fda4c131fe4ed5e959c4832763;p=xonotic%2Fxonotic-data.pk3dir.git

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

34863a007ec889fda4c131fe4ed5e959c4832763