From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sat, 15 May 2010 18:05:35 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/umbraplayermodel
X-Git-Tag: xonotic-v0.1.0preview~611^2
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=709df297e89bc0440f60c1ec97cc1d67b9ef12d1;p=xonotic%2Fxonotic-data.pk3dir.git

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

709df297e89bc0440f60c1ec97cc1d67b9ef12d1