From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Tue, 18 May 2010 19:12:49 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/ignisplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^3~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa327f295d060064d74925301ad01836b8b7041e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge commit 'origin/master' into diabolik/ignisplayermodel
---

aa327f295d060064d74925301ad01836b8b7041e