[perl-Mail-GnuPG/f17] (4 commits) ...Merge cleanup.