From: Mario <zacjardine@y7mail.com>
Date: Tue, 2 Dec 2014 02:35:03 +0000 (+1100)
Subject: Merge branch 'itsme/vorix'
X-Git-Tag: xonotic-v0.8.0~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8977c1928dccbf4567088b2efd3171260ca9162a;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'itsme/vorix'
---

8977c1928dccbf4567088b2efd3171260ca9162a