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

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

1b9fb2415152cf5a365cfaf9cf234372aaba6852