From: Mario <zacjardine@y7mail.com>
Date: Fri, 9 Oct 2015 08:47:38 +0000 (+1000)
Subject: Merge branch 'master' into Mario/multiplayer_snake
X-Git-Tag: xonotic-v0.8.2~1841^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b67505ebdf6ddb105e3ec745a71dae5490ad2508;p=xonotic%2Fxonotic-data.pk3dir.git

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

b67505ebdf6ddb105e3ec745a71dae5490ad2508