From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Tue, 15 Jun 2010 19:09:19 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/nexmodel
X-Git-Tag: xonotic-v0.1.0preview~31^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fmediasource.git;a=commitdiff_plain;h=7d9981072ff2f6aa4d639503844c94a4c39d7458

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

7d9981072ff2f6aa4d639503844c94a4c39d7458