From: Rudolf Polzer Date: Thu, 26 Jan 2012 14:52:44 +0000 (+0100) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic X-Git-Tag: xonotic-v0.6.0~30^2~20^2 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=c38aad81dd7d68fc5e6d00a7986ad55e1aad06b3;p=xonotic%2Fxonotic.git Merge branch 'master' of /var/cache/git/xonotic/xonotic --- c38aad81dd7d68fc5e6d00a7986ad55e1aad06b3