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

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

556b1f7292154f1a76187fb6cef113b9c22430b9