From: Samual <samual@xonotic.org>
Date: Wed, 26 Oct 2011 03:10:21 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~35^2~66^2~2^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=008ad760c67f5401849e95dadea1fb87096907e1;p=xonotic%2Fxonotic-data.pk3dir.git

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

008ad760c67f5401849e95dadea1fb87096907e1