From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sun, 23 May 2010 05:03:00 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/ignisplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^3~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bf5661dfd2df8cbc04183e7f007b236d92333e4b;p=xonotic%2Fxonotic-data.pk3dir.git

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

bf5661dfd2df8cbc04183e7f007b236d92333e4b