From: Rudolf Polzer Date: Wed, 15 Dec 2010 21:16:30 +0000 (+0100) Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.1.0preview~11^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8116d0a77a63d54601ed75b15746b19ce66e467a;p=xonotic%2Fxonotic.git Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic --- 8116d0a77a63d54601ed75b15746b19ce66e467a