From: Mario <zacjardine@y7mail.com>
Date: Fri, 28 Nov 2014 04:20:41 +0000 (+1100)
Subject: Merge branch 'master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~20
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=0a92453278b65a165e83e64a989b5e7de38ccf02;p=xonotic%2Fxonotic-data.pk3dir.git

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

0a92453278b65a165e83e64a989b5e7de38ccf02