From: Rudolf Polzer Date: Wed, 13 Oct 2010 07:29:48 +0000 (+0200) Subject: Merge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority' X-Git-Tag: xonotic-v0.1.0preview~307^2~22^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=150ef5e654ce6742d1560feb7b5c69bbddececb3;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'refs/remotes/origin/fruitiex/vote_simplemajority' --- 150ef5e654ce6742d1560feb7b5c69bbddececb3