From: Rudolf Polzer Date: Thu, 19 May 2011 19:34:03 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/samual/balance' X-Git-Tag: xonotic-v0.5.0~220^2~4^2~1^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c45bfd705e661594c1edbd1f8d57d2badb709e7a;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/samual/balance' --- c45bfd705e661594c1edbd1f8d57d2badb709e7a