upstream/1.7_git0.20140707

Daniel Kahn Gillmor

@dkg

4742c3b9 · Merge upstream's beta as i prepare an experimental release · Jul 07, 2014

merge upstream commits as i prepare a beta release for enigmail 1.7 from git 2014-07-07