From: Samual <samual@xonotic.org>
Date: Mon, 28 Feb 2011 23:33:43 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/lightning_gun
X-Git-Tag: xonotic-v0.8.0~152^2~409^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2deb7767c2f74d15b037fdc9fa41518670460207;p=xonotic%2Fxonotic-data.pk3dir.git

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

2deb7767c2f74d15b037fdc9fa41518670460207