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

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

718d4a8affa7668a08620608fb4e9098b9a9b125