From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 24 May 2010 21:07:24 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/ignisplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^3
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=2c0c9177a785b548215359e7c01991ece1701e5f

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

2c0c9177a785b548215359e7c01991ece1701e5f