From: Rudolf Polzer Date: Sun, 31 Jul 2011 19:26:01 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~45^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=66701f1f5ec7b84b5dd655a9cf36c6e9a7730255;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 66701f1f5ec7b84b5dd655a9cf36c6e9a7730255