From: Mario <zacjardine@y7mail.com>
Date: Thu, 8 Oct 2015 06:07:55 +0000 (+1000)
Subject: Merge branch 'master' into Mario/multiplayer_snake
X-Git-Tag: xonotic-v0.8.2~1841^2~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=e32f518af0bfa21335fe0de1320e33ef78551bcb;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

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

e32f518af0bfa21335fe0de1320e33ef78551bcb