From: Samual <samual@xonotic.org>
Date: Tue, 1 Nov 2011 18:17: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~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b25f26050ac226793d8ce7fde67341f896504485;p=xonotic%2Fxonotic-data.pk3dir.git

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

b25f26050ac226793d8ce7fde67341f896504485