From: Samual <samual@xonotic.org>
Date: Sat, 14 May 2011 15:58:57 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/balance
X-Git-Tag: xonotic-v0.5.0~220^2~4^2~1^2^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f87d67e5a9cfbbf50590ac28016b80d642eec1df;p=xonotic%2Fxonotic-data.pk3dir.git

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

f87d67e5a9cfbbf50590ac28016b80d642eec1df