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

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

6f8dfdf45ac418c2dc7241ebfe5e3456c4f8939a