From: Jakob MG <jakob_mg@hotmail.com>
Date: Tue, 11 Oct 2011 08:41:15 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/tzork/misc-fixes'
X-Git-Tag: xonotic-v0.6.0~40^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3ec7e18c56a9620e7c982ac765ee70a37ac5d2f9;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/tzork/misc-fixes'
---

3ec7e18c56a9620e7c982ac765ee70a37ac5d2f9