wyr4137/ICS5-Map — pull request #390 by guzmana3 (2013-03-04 10:23:43+00:00)
Title: Attempted to fix country explorer file again

The first time I fixed the conflicts that I saw when I did git pull upstream master, which were completely different from the conflicts in this second time.