From: Samual <samual@xonotic.org>
Date: Thu, 22 Sep 2011 13:41:24 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~118^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44ae1d36ba2d4628e270015637eb13f7e67b0109;p=xonotic%2Fxonotic-data.pk3dir.git

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

44ae1d36ba2d4628e270015637eb13f7e67b0109