From: Rudolf Polzer Date: Fri, 20 Aug 2010 15:54:39 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.1.0preview~286 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f1091cc7a1e77ffbf261907cb325c46cdd22a58f Merge branch 'master' of ssh://git.xonotic.org/xonotic --- f1091cc7a1e77ffbf261907cb325c46cdd22a58f