From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sat, 8 May 2010 19:14:59 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/umbraplayermodel
X-Git-Tag: xonotic-v0.1.0preview~640
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0532cf8607bb25cebcf3c75d1748aa0b7df5d143;p=xonotic%2Fxonotic-data.pk3dir.git

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

0532cf8607bb25cebcf3c75d1748aa0b7df5d143