From: Samual <samual@xonotic.org>
Date: Tue, 27 Sep 2011 03:40:02 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b87370239d9eacc2cf1d258c5f918049262d18bc;p=xonotic%2Fxonotic-data.pk3dir.git

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

b87370239d9eacc2cf1d258c5f918049262d18bc