From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 14 Jun 2010 18:42:41 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/erebusnyxplayermodel
X-Git-Tag: xonotic-v0.1.0preview~546
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b1423eda7e2050b008395f08093554b30956292b;p=xonotic%2Fxonotic-data.pk3dir.git

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

b1423eda7e2050b008395f08093554b30956292b