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

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

122e8d0e383558cb4aa730b1d441b141c3d962ae