From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 10:31:19 +0000 (+0000)
Subject: Merge branch 'Mario/vehicles' into 'master'
X-Git-Tag: xonotic-v0.8.2~2059
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=068f22a2de30f4352e3b6a937f030d3f09c64b3b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/vehicles' into 'master'

Merge branch Mario/vehicles (XXL merge request)

Good luck, TimePath.

See merge request !189
---

068f22a2de30f4352e3b6a937f030d3f09c64b3b