From: Samual Lenks Date: Mon, 3 Jun 2013 16:28:56 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/matthiaskrgr/map_descs' X-Git-Tag: xonotic-v0.7.0~16 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4844eea689a930608c31e7da2057e9e71ef31a7b;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/matthiaskrgr/map_descs' --- 4844eea689a930608c31e7da2057e9e71ef31a7b