noxrepo/pox — pull request #25 by samwhitlock (2012-06-19 22:26:26+00:00)
Title: removing bad merge effects

isGlobal and isLocal were duplicated because of bad merge conflict resolution.