From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 29 Nov 2010 09:38:44 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/moveturrets-fix'
X-Git-Tag: xonotic-v0.1.0preview~96
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=10ff53d641f67cca5800983ff3476581ac50ea80;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/tzork/moveturrets-fix'
---

10ff53d641f67cca5800983ff3476581ac50ea80