From: Mario <zacjardine@y7mail.com>
Date: Thu, 8 Oct 2015 06:12:29 +0000 (+1000)
Subject: Merge branch 'master' into Mario/multiplayer_snake
X-Git-Tag: xonotic-v0.8.2~1841^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=be730c0d51317b19c7267fde6edf50f9de1fa677;p=xonotic%2Fxonotic-data.pk3dir.git

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

be730c0d51317b19c7267fde6edf50f9de1fa677