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

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

333e64c840c6b491fe47a0b9b72b4188040ab3fa