From: Rudolf Polzer Date: Sat, 4 Jun 2011 20:31:16 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~74 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=2c86c96dcf2a3a70f398afb5e229380cd89a99e1 Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 2c86c96dcf2a3a70f398afb5e229380cd89a99e1