From: Mario <zacjardine@y7mail.com>
Date: Thu, 27 Nov 2014 02:37:42 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/master' into Mario/weapons_new
X-Git-Tag: xonotic-v0.8.0~122^2~49
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d2cd0d526937f5c2f892ca588690f76eb64f870f;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into Mario/weapons_new
---

d2cd0d526937f5c2f892ca588690f76eb64f870f