From: Rudolf Polzer Date: Tue, 27 Dec 2011 12:54:22 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~32 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=52a7995f8fa18fa0ba2576dc289896621840487b;p=xonotic%2Fxonotic.git Merge branch 'master' of /var/cache/git/xonotic/xonotic --- 52a7995f8fa18fa0ba2576dc289896621840487b