Merge branch 'opt-into-emails' of github.com:ghostery/ghostery-extens…
d619a8b
…ion into opt-into-emails