From: Mario <mario.mario@y7mail.com>
Date: Sun, 8 Dec 2013 06:02:38 +0000 (+1100)
Subject: Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3di... 
X-Git-Tag: xonotic-v0.8.0~152^2~296
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e901097433210fe83c1edc9edc48b900409d2b1a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'samual/weapons' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir into samual/weapons
---

e901097433210fe83c1edc9edc48b900409d2b1a