From: Mario <mario@smbclan.net>
Date: Wed, 13 Jul 2016 09:05:20 +0000 (+1000)
Subject: Merge branch 'master' into Mario/teams_bitflag
X-Git-Tag: xonotic-v0.8.2~700^2~10^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F335%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

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

ccf145b9b0372a5b402465ab578ca48d943ffd88