From: Rudolf Polzer Date: Mon, 29 Aug 2011 12:42:05 +0000 (+0200) Subject: Merge remote branch 'origin/samual/balance' X-Git-Tag: xonotic-v0.5.0~28 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=998e124b71488ff00eeb48a6a7d606cbe1ef90f2;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/samual/balance' --- 998e124b71488ff00eeb48a6a7d606cbe1ef90f2