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

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

a1dde978a4e4af18cc3d744b34234dccb1885c73