From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sun, 13 Jun 2010 05:35:44 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/seraphinaplayermodel
X-Git-Tag: xonotic-v0.1.0preview~546^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5edeb786a80b4ea0254d504f655447174375b7e3;p=xonotic%2Fxonotic-data.pk3dir.git

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

5edeb786a80b4ea0254d504f655447174375b7e3