From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 18 May 2010 18:55:12 +0000 (+0200)
Subject: Merge remote branch 'refs/remotes/origin/diabolik/pyriaplayermodel'
X-Git-Tag: xonotic-v0.1.0preview~601
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=30f1ddad3c81e1f06b23d18150ce63a76670dbe7;p=xonotic%2Fxonotic-data.pk3dir.git

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

30f1ddad3c81e1f06b23d18150ce63a76670dbe7