From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 16 Oct 2010 19:36:52 +0000 (+0200)
Subject: Merge remote branch 'origin/tzork/turrets'
X-Git-Tag: xonotic-v0.1.0preview~299
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f069176e9dcd910dd4676499ffc9f14078ed0c7;p=xonotic%2Fxonotic-data.pk3dir.git

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

1f069176e9dcd910dd4676499ffc9f14078ed0c7