From: Rudolf Polzer Date: Fri, 27 May 2011 17:39:03 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~77 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2bd8ddc58ff8381b903e4e3ca070c9fbf5b63d0f;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 2bd8ddc58ff8381b903e4e3ca070c9fbf5b63d0f