From: Mario <mario.mario@y7mail.com>
Date: Tue, 28 Jan 2014 05:32:56 +0000 (+1100)
Subject: Merge branch 'master' into Mario/teamswitch_fix2
X-Git-Tag: xonotic-v0.8.0~196^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=795df3bd94145e133bdc08b8c9b9189b375ff41d;p=xonotic%2Fxonotic-data.pk3dir.git

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

795df3bd94145e133bdc08b8c9b9189b375ff41d