Vizzuality/gfw — pull request #492 by matallo (2014-04-16 10:29:43+00:00)
Title: solving conflicts

don't merge, still needs revision by WRI