From: Rudolf Polzer Date: Sun, 29 Jan 2012 17:45:41 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~30^2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99bc9da5e9b82876d2d945f9e622478d1c4f48c4;p=xonotic%2Fxonotic.git Merge branch 'master' of /var/cache/git/xonotic/xonotic --- 99bc9da5e9b82876d2d945f9e622478d1c4f48c4