From: Samual <samual@xonotic.org>
Date: Wed, 28 Sep 2011 23:05:21 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~36
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f8b86e2d48479e07daf1d1831eec8ae3f9f7c485;p=xonotic%2Fxonotic-data.pk3dir.git

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

f8b86e2d48479e07daf1d1831eec8ae3f9f7c485