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

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

04703608af6c8f09b15c37f6f3a7464b83db8a37