From: Rudolf Polzer Date: Sat, 3 Aug 2013 12:49:26 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.8.0~93 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=96b66b08473f0956ffa3f989fd0f71461fb21494;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 96b66b08473f0956ffa3f989fd0f71461fb21494