From: Samual <samual@xonotic.org>
Date: Mon, 17 Oct 2011 15:58:52 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~35^2~66^2~2^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b5ce2fc20ff60687d0afc37df22a5c0ad17c2501;p=xonotic%2Fxonotic-data.pk3dir.git

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

b5ce2fc20ff60687d0afc37df22a5c0ad17c2501