From: terencehill <piuntn@gmail.com>
Date: Sun, 15 Sep 2013 18:07:21 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/vehicles_fixes
X-Git-Tag: xonotic-v0.8.0~243^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28db67726bdcc01ded4d4c942326dfc7f7375e18;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/vehicles_fixes
---

28db67726bdcc01ded4d4c942326dfc7f7375e18