From: Mario <zacjardine@y7mail.com>
Date: Sun, 16 Nov 2014 12:20:35 +0000 (+1100)
Subject: Merge branch 'Mario/legacy_gametypenames'
X-Git-Tag: xonotic-v0.8.0~144
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99a15ec6d46a049ac04446c17ad407551dd500e1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/legacy_gametypenames'
---

99a15ec6d46a049ac04446c17ad407551dd500e1