From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 14 Apr 2010 17:58:01 +0000 (+0200)
Subject: Merge commit 'origin/tzork/vehicles'
X-Git-Tag: xonotic-v0.1.0preview~652
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3a043696cfd182c6ff34e4542fbdcff4c64da883;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/tzork/vehicles'
---

3a043696cfd182c6ff34e4542fbdcff4c64da883