mozilla/browserid — pull request #3957 by shane-tomlinson (2013-10-08 16:16:18+00:00)
Title: Feeley email updates

@ryanfeeley - I manually merged what I could from PR #3938 and then manually edited the rest. How is this looking for you?