From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 16:48:46 +0000 (+1100)
Subject: Merge branch 'Mario/nade_updates'
X-Git-Tag: xonotic-v0.8.0~162
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=90efb5467fe733b53d89c0b32da3dca8252e7f19;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/nade_updates'
---

90efb5467fe733b53d89c0b32da3dca8252e7f19