From: Mario <zacjardine@y7mail.com>
Date: Fri, 5 Dec 2014 12:03:18 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57e8b59f96ec28979c3dc01811412c9c26e60fdc;p=xonotic%2Fxonotic-data.pk3dir.git

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

57e8b59f96ec28979c3dc01811412c9c26e60fdc