From: Rudolf Polzer Date: Thu, 14 Jun 2012 08:25:35 +0000 (+0200) Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~54^2 X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=ce98682e66519168231fe08669290011a158f24b;p=xonotic%2Fxonotic.git Merge branch 'master' of /var/cache/git/xonotic/xonotic --- ce98682e66519168231fe08669290011a158f24b