From: Jakob MG <jakob_mg@hotmail.com>
Date: Mon, 6 Jun 2011 14:23:49 +0000 (+0200)
Subject: Merge remote branch 'origin/cbrutail/trakmodelfixes'
X-Git-Tag: xonotic-v0.5.0~98^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f7bcb1a063566a620f458de71e0833b07c02336f;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/cbrutail/trakmodelfixes'
---

f7bcb1a063566a620f458de71e0833b07c02336f