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

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

d51982782510331bbe81069d3a9f3049a2bbf268