From: unknown <jakob@.(none)>
Date: Sun, 17 Apr 2011 13:09:28 +0000 (+0200)
Subject: Merge remote branch 'origin/master' into tzork/vehicles-2
X-Git-Tag: xonotic-v0.5.0~199^2~11^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f94b6750eadebc8d9929bcdb14e37ac5a8514a0;p=xonotic%2Fxonotic-data.pk3dir.git

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

6f94b6750eadebc8d9929bcdb14e37ac5a8514a0