From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Wed, 19 May 2010 19:47:10 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/ignisplayermodel
X-Git-Tag: xonotic-v0.1.0preview~573^3~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad069a2d10fe03c6ab21d979c6deef816a19070d;p=xonotic%2Fxonotic-data.pk3dir.git

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

ad069a2d10fe03c6ab21d979c6deef816a19070d