From: Rudolf Polzer Date: Wed, 1 Jun 2011 04:48:03 +0000 (+0200) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.5.0~74^2~1 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=d1066e479cf8902154984f1d982ff285cd41f80d;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- d1066e479cf8902154984f1d982ff285cd41f80d