From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 5 Apr 2011 19:08:01 +0000 (+0200)
Subject: Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into... 
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~80
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=89440e0be374edf1542983d5d6177faa194bfb25;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'tzork/vehicles-2' of ssh://git.xonotic.org/xonotic-data.pk3dir into tzork/vehicles-2
---

89440e0be374edf1542983d5d6177faa194bfb25