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

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

77d1695bff70192e094ce45ee359e0fc29aaf580