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

Merge branch 'Mario/gametype_votes'
---

c412d3eef639e2d8b68682c51fd44bedb5d4308f