From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Wed, 12 May 2010 20:10:33 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/pyriaplayermodel
X-Git-Tag: xonotic-v0.1.0preview~628^2~2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=9183fb383cea48ade0a8aa58a9a184ee4da9a789;p=xonotic%2Fxonotic-data.pk3dir.git

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

9183fb383cea48ade0a8aa58a9a184ee4da9a789