From: Rudolf Polzer Date: Wed, 29 Feb 2012 10:02:19 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/tzork/gm_nexball' X-Git-Tag: xonotic-v0.6.0~40 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a321c69d9d812d97741c33099eaf295b1fa518ab;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/tzork/gm_nexball' --- a321c69d9d812d97741c33099eaf295b1fa518ab