From: Samual <samual@xonotic.org>
Date: Sun, 18 Sep 2011 13:32:22 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~12
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=daaa6a440c2928b249cd66dfd4a4e36261a47f7a

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

daaa6a440c2928b249cd66dfd4a4e36261a47f7a