From: Rudolf Polzer <rpolzer@nb-04.(none)>
Date: Fri, 26 Mar 2010 15:49:20 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/turretfix'
X-Git-Tag: xonotic-v0.1.0preview~677
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=10c5904ff61b074384f156c8dca46a747c61ddc1;p=xonotic%2Fxonotic-data.pk3dir.git

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

10c5904ff61b074384f156c8dca46a747c61ddc1