From: Mario <zacjardine@y7mail.com>
Date: Sun, 27 Sep 2015 03:40:11 +0000 (+0000)
Subject: Merge branch 'Mario/snake' into 'master'
X-Git-Tag: xonotic-v0.8.2~1906
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d74c7101cf00af4ab91203c7a56f33dd1cba78db;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/snake' into 'master'

Merge branch Mario/snake (Snake? Snake! SNAAAAKE!!)

Title says it all, soldier.

See merge request !231
---

d74c7101cf00af4ab91203c7a56f33dd1cba78db