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

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

e8f0b7b07920103e92daac21e3b5e5653c5a86fe