From: Mario <zacjardine@y7mail.com>
Date: Tue, 20 Jan 2015 00:55:26 +0000 (+1100)
Subject: Merge branch 'master' into Mario/vehicles
X-Git-Tag: xonotic-v0.8.2~2059^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49aec17ab86b4b27fc372ed122aa3686219e8453;p=xonotic%2Fxonotic-data.pk3dir.git

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

49aec17ab86b4b27fc372ed122aa3686219e8453