From: Samual <samual@xonotic.org>
Date: Tue, 4 Oct 2011 22:53:20 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=8249c3a8e3cb9b205f707caacf8756f651772a61;p=xonotic%2Fxonotic-data.pk3dir.git

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

8249c3a8e3cb9b205f707caacf8756f651772a61