From: Samual <samual@xonotic.org>
Date: Wed, 14 Sep 2011 06:01:12 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c73ad528e74cecbb5b7093111f2fddbe8dfe1eac;p=xonotic%2Fxonotic-data.pk3dir.git

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

c73ad528e74cecbb5b7093111f2fddbe8dfe1eac