From: Rudolf Polzer Date: Thu, 25 Nov 2010 20:29:25 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~30 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d18650a33685341eaba7d5aa4ede7c22e4e47277 Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- d18650a33685341eaba7d5aa4ede7c22e4e47277