From: Pearce Michal Date: Fri, 20 Jan 2012 17:33:00 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/master' into theshadow/reflection X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a4a96d7b789b4cea121b9f5df3dcc19006f84fa9;p=xonotic%2Fxonotic-maps.pk3dir.git Merge remote-tracking branch 'origin/master' into theshadow/reflection --- a4a96d7b789b4cea121b9f5df3dcc19006f84fa9