From: Jakob MG <jakob_mg@hotmail.com>
Date: Thu, 9 Jun 2011 17:49:10 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into tzork/vehicles-2
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~28
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8efe68106722fd143f10c172c71be6e869ff5b21;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into tzork/vehicles-2
---

8efe68106722fd143f10c172c71be6e869ff5b21