From: Mario <zacjardine@y7mail.com>
Date: Tue, 4 Nov 2014 06:09:45 +0000 (+1100)
Subject: Merge branch 'master' into Mario/gametype_votes
X-Git-Tag: xonotic-v0.8.0~168^2~3
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=50b99ba384dadafe7d4e15be889cdb6cce5189a7

Merge branch 'master' into Mario/gametype_votes
---

50b99ba384dadafe7d4e15be889cdb6cce5189a7