From: tzork <jakob_mg@hotmail.com>
Date: Wed, 2 Feb 2011 08:15:14 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/trakfix1'
X-Git-Tag: xonotic-v0.5.0~113
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=950c84e27e9099c19bb655a70b949152231ccc78;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/tzork/trakfix1'
---

950c84e27e9099c19bb655a70b949152231ccc78