From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 3 Mar 2012 18:01:22 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/cbrutail/nexmodelfix'
X-Git-Tag: xonotic-v0.6.0~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=88b40825d49216d6d8d403bf4e8d7420803890c1;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/cbrutail/nexmodelfix'
---

88b40825d49216d6d8d403bf4e8d7420803890c1