From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 21 Jun 2011 17:11:18 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/tzork/vehicles-2'
X-Git-Tag: xonotic-v0.5.0~199^2~11
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=0e5d97682e9478c51d8033a3ab9624471da0579d

Merge remote-tracking branch 'origin/tzork/vehicles-2'

Conflicts:
	qcsrc/server/ctf.qc
---

0e5d97682e9478c51d8033a3ab9624471da0579d