From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 28 Dec 2010 15:09:28 +0000 (+0100)
Subject: Merge remote branch 'origin/tzork/uzifix'
X-Git-Tag: xonotic-v0.5.0~330^2~18^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96a0a904730ee4c61e68d8b94ebf67fbee0ff6ba;p=xonotic%2Fxonotic-data.pk3dir.git

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

96a0a904730ee4c61e68d8b94ebf67fbee0ff6ba