From: Rudolf Polzer Date: Fri, 21 Sep 2012 18:40:53 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~37^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f9c0c1c0fb0502fbc5c19b506d28f73a102ee5b6;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- f9c0c1c0fb0502fbc5c19b506d28f73a102ee5b6