From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Sat, 15 May 2010 18:16:28 +0000 (-0400)
Subject: Merge commit 'origin/master' into diabolik/weaponscale
X-Git-Tag: xonotic-v0.1.0preview~605^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7e522cf57967de54d3fb6c159afaa9b13594c722;p=xonotic%2Fxonotic-data.pk3dir.git

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

7e522cf57967de54d3fb6c159afaa9b13594c722