From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sat, 5 Jun 2010 18:43:19 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/gakplayermodel
X-Git-Tag: xonotic-v0.1.0preview~547^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f27398e6b469fee0b07704fc135f12359b9bde5;p=xonotic%2Fxonotic-data.pk3dir.git

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

1f27398e6b469fee0b07704fc135f12359b9bde5