From: Samual <samual@xonotic.org>
Date: Wed, 2 Mar 2011 17:04:56 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.5.0~309^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=36878f699aaec94758378642ee60816817a9a5a5;p=xonotic%2Fxonotic-data.pk3dir.git

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

36878f699aaec94758378642ee60816817a9a5a5