From: Pearce 'theShadow' Michal Date: Thu, 16 Feb 2012 16:13:35 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into theshadow/reflection X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ae192e71809ef5c04dfcd30395b95da9913b9ab;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/master' into theshadow/reflection --- 8ae192e71809ef5c04dfcd30395b95da9913b9ab