From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 15 May 2010 20:28:38 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/umbraplayermodel'
X-Git-Tag: xonotic-v0.1.0preview~611
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eeb9831b01ef140b1b4ab1f963ccc0c73a8aa0e5;p=xonotic%2Fxonotic-data.pk3dir.git

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

eeb9831b01ef140b1b4ab1f963ccc0c73a8aa0e5