From: Rudolf Polzer Date: Thu, 20 Oct 2011 19:49:47 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~69^2~18 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=79765c958b0901988b9ec4990c2eccfb9352c803;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 79765c958b0901988b9ec4990c2eccfb9352c803