From: Samual <samual@xonotic.org>
Date: Thu, 13 Jan 2011 15:00:11 +0000 (-0500)
Subject: Merge branch 'master' into samual/balancesamual
X-Git-Tag: xonotic-v0.5.0~318^2~124^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6ea23ab3d26fa5769b21c7886b7dc8ed55111059;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into samual/balancesamual
---

6ea23ab3d26fa5769b21c7886b7dc8ed55111059