From: Rudolf Polzer Date: Mon, 26 Apr 2010 20:48:32 +0000 (+0200) Subject: Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~480 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8f10e29d659231bc3ec3896fde9b1322c905ffa7 Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic --- 8f10e29d659231bc3ec3896fde9b1322c905ffa7