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

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

22042893e4c8ce0f178043ace460c7831c3df4d2