From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Wed, 19 May 2010 19:36:48 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/umbraplayermodel
X-Git-Tag: xonotic-v0.1.0preview~593^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d9acf9dc3cf66812f7225317c56bc25fd5698d98;p=xonotic%2Fxonotic-data.pk3dir.git

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

d9acf9dc3cf66812f7225317c56bc25fd5698d98