From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Mon, 14 Jun 2010 20:27:16 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/nexmodel
X-Git-Tag: xonotic-v0.1.0preview~526^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e362ec822413d772cc26250cae79813021a3e6ed;p=xonotic%2Fxonotic-data.pk3dir.git

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

e362ec822413d772cc26250cae79813021a3e6ed