From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 16:37:26 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/new_shotgun_tracing
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~51^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d26e546fdd2a816edae2e3347267f39026e7fbe;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/new_shotgun_tracing
---

7d26e546fdd2a816edae2e3347267f39026e7fbe