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

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

3996a6bfe3076469afe4070449bb377ed4064fc4