From: Jakob MG <jakob_mg@hotmail.com>
Date: Wed, 22 Jun 2011 18:11:04 +0000 (+0200)
Subject: Merge remote branch 'origin/tzork/turrets-csqc'
X-Git-Tag: xonotic-v0.5.0~199^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2e44f19e0c92cf7fab9e7d21f15abda16118765b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/tzork/turrets-csqc'
---

2e44f19e0c92cf7fab9e7d21f15abda16118765b