From: Samual <samual@xonotic.org>
Date: Mon, 26 Sep 2011 16:34:09 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~92^2~1^2~53
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=442cb7d862660f9bf07ca0333b413e52db3f7113;p=xonotic%2Fxonotic-data.pk3dir.git

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

442cb7d862660f9bf07ca0333b413e52db3f7113