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

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

c6b0bfd9440e9baad268f9409ec6de5c3d56d06f