From: Morphed <Morphed@o2.pl>
Date: Tue, 5 Apr 2011 00:51:10 +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~83
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a96bd1e14a105139e488a8588ebdedd7ab04f7f5;p=xonotic%2Fxonotic-data.pk3dir.git

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

a96bd1e14a105139e488a8588ebdedd7ab04f7f5