From: Mario <zacjardine@y7mail.com>
Date: Tue, 9 Dec 2014 01:52:23 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=945e6b7cee9fa95c13a80805b2f5d60256216793;p=xonotic%2Fxonotic-data.pk3dir.git

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

945e6b7cee9fa95c13a80805b2f5d60256216793