master updated (4cb53c0528 -> fdfd7ef6f3)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  4cb53c0528 Improve don't save bookmark context from encrypted files
       new  5ee3990de6 ; * lisp/mail/hashcash.el: Remove redundant :group args.
       new  f43914b4d0 Add X-Hashcash to the end of mail headers
       new  fdfd7ef6f3 Fix failing image-dired test


Summary of changes:
 lisp/mail/hashcash.el                     | 25 +++++++++----------------
 test/lisp/image/image-dired-util-tests.el | 30 ++++++++++++++++++++++--------
 2 files changed, 31 insertions(+), 24 deletions(-)