From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 13 Jun 2010 18:02:45 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/ignisplayermodel'
X-Git-Tag: xonotic-v0.1.0preview~546^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f97462229a403b7b0cc7f011406fe320f3590108;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'refs/remotes/origin/diabolik/ignisplayermodel'
---

f97462229a403b7b0cc7f011406fe320f3590108