From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 24 May 2010 21:08:17 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/umbraplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^5
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e183a6780db8f547b398261325138a0941c340fd

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

e183a6780db8f547b398261325138a0941c340fd