From: Samual <samual@xonotic.org>
Date: Sat, 14 May 2011 20:30:59 +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
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0a79dacada6048f62fad2d91fba7fc761f57464a;p=xonotic%2Fxonotic-data.pk3dir.git

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

0a79dacada6048f62fad2d91fba7fc761f57464a