From: Rudolf Polzer Date: Fri, 21 May 2010 21:18:06 +0000 (+0200) Subject: Merge remote branch 'origin/samual/balanceSamual' X-Git-Tag: xonotic-v0.1.0preview~585 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=5f9a7f369de12c81ac950f04d5d7d250640f86a9;hp=--cc Merge remote branch 'origin/samual/balanceSamual' --- 5f9a7f369de12c81ac950f04d5d7d250640f86a9