From: Samual <samual@xonotic.org>
Date: Wed, 21 Sep 2011 13:32:29 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f44da40b401df22d865c02e81b0a7ba9a5268b22;p=xonotic%2Fxonotic-data.pk3dir.git

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

f44da40b401df22d865c02e81b0a7ba9a5268b22