From: Rudolf Polzer Date: Fri, 15 Jul 2011 18:03:36 +0000 (+0200) Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~57 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3326f7cebf54279c316f1f8132b37b80260ad120;p=xonotic%2Fxonotic.git Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic --- 3326f7cebf54279c316f1f8132b37b80260ad120