From: Samual <samual@xonotic.org>
Date: Sat, 1 Oct 2011 16:08:07 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~10
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1e926ffdd1dc18bdde7a189a54938ac205d39260;p=xonotic%2Fxonotic-data.pk3dir.git

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

1e926ffdd1dc18bdde7a189a54938ac205d39260