From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Thu, 27 May 2010 22:45:28 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/gakplayermodel
X-Git-Tag: xonotic-v0.1.0preview~570
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=025ab6614545df21ad7392f7806ad375b9c40af3;p=xonotic%2Fxonotic-data.pk3dir.git

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

025ab6614545df21ad7392f7806ad375b9c40af3