From: unknown <jakob@.(none)>
Date: Mon, 18 Apr 2011 20:26:56 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into tzork/vehicles-2
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~57
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=18f2a272b9afb8364dcd7f98e382bfe7eafa94e2;p=xonotic%2Fxonotic-data.pk3dir.git

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

18f2a272b9afb8364dcd7f98e382bfe7eafa94e2