From: Mario <zacjardine@y7mail.com>
Date: Wed, 26 Nov 2014 21:55:02 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~51
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29885aa67f14a0fd7d7bc66b134eb7a2e5dfcba4;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/weapons_new
---

29885aa67f14a0fd7d7bc66b134eb7a2e5dfcba4