Merge branch 'master' into nohook

diff --cc crypt.cpkg
Simple merge

diff --cc lib-mx/mx.c
Simple merge

diff --cc protos.h
index 8677928,560a1b2..dec0ccf
--- 1/protos.h
--- 2/protos.h
+++ b/protos.h
@@@ -37,12 -38,12 +38,10 @@@ int mutt_cmp_header (const HEADER*, con
  ssize_t _mutt_expand_path(char *, ssize_t, const char *, int);
  #define mutt_expand_path(s, n) _mutt_expand_path((s), (n), (s), 0)
  
 -char *mutt_find_hook (int, const char *);
  char *mutt_get_body_charset (char *, ssize_t, BODY *);
  const char *mutt_get_name (address_t *);
 -const char *mutt_crypt_hook (address_t *);
  char *mutt_make_date (char *, ssize_t);
  
- const char *mutt_make_version(void);
- 
  const char *mutt_fqdn (short);
  
  void mutt_add_to_reference_headers (ENVELOPE * env, ENVELOPE * curenv,

diff --cc send.c
Simple merge