Merge branch '1.5.20-1+fix533459'

diff --cc debian/changelog
index 6fe2e2b1cbc63203daf810d177b1d35924c26b91,abf24ca40b0eca4207f8e8c483d0102c998ebfe2..011bcab594ab54a84a0bdf47f46b0b2142db7ac6
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,8 +1,20 @@@
 -mutt (1.5.20-1+fix533459) unstable; urgency=low
 +mutt (1.5.20-2) unstable; urgency=low
  
 -  * adding a patch to fix a bug
 -
 - -- Antonio Radici <antonio@dyne.org>  Wed, 17 Jun 2009 23:43:47 +0100
 +  * debian/patches/series:
 +    + upstream/533209-mutt_perror.patch: better error reporting if a mailbox
 +      cannot be opened (Closes: 533209)
++    + upstream/533459-unmailboxes: fixes the segfault with the unmailboxes 
++      command (Closes: 533459)
 +    + added the right copyright misc/smime_keys-manpage.patch
 +    + mutt-patched/sidebar: refreshed
 +    + mutt-patched/sidebar-{dotted,sorted} added (Closes: 523774)
 +  * debian/control:
 +    + added default-mta to Recommends, removed exim4 (Closes: 533442)
 +    + added elinks-lite to B-D, removed links (Closes: 533445)
 +  * debian/mutt.install and debian/extra/lib/mailto-mutt: 
 +    + added the firefox mailto handler (Closes: 406850)
 + 
 + -- Antonio Radici <antonio@dyne.org>  Tue, 16 Jun 2009 23:20:32 +0100
  
  mutt (1.5.20-1) unstable; urgency=low
  

diff --cc debian/patches/series
index c0d3ad96462e95b578ac059f2b1ccb0d5cd75a46,6cdd6955001ed6626e6477d7ddbb13232e68c5ae..7dadcb72f5ef0898eacc24d2297a1a84563dee0c
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -40,8 -40,9 +40,10 @@@ misc/smime.r
  #upstream/502628-attach_charset-doc.patch
  #upstream/504530-stunnel-account_hook-doc.patch
  #upstream/530887-dovecot-imap.patch
 +upstream/533209-mutt_perror.patch
  
+ upstream/533459-unmailboxes
+ 
  misc/hyphen-as-minus.patch
  #misc/manpage-typos.patch
  misc/smime_keys-manpage.patch

diff --cc debian/patches/upstream/533459-unmailboxes
index 0000000000000000000000000000000000000000,4a12e86788832724f3e6a38844f467b5d63cbe9c..91ea411767c48cd5e4409e6e545041686d18b091
mode 000000,100644..100644
--- /dev/null
--- 2/debian/patches/upstream/533459-unmailboxes
+++ b/debian/patches/upstream/533459-unmailboxes
@@@ -1,0 -1,10 +1,13 @@@
++mutt segfaults everytime the 'unmailboxes' command is used 
++(see upstream #3273)
++
+ --- a/buffy.c
+ +++ b/buffy.c
+ @@ -236,7 +236,6 @@
+      {
+        if(*tmp)
+        {
+ -        FREE (&((*tmp)->path));
+          tmp1=(*tmp)->next;
+          FREE (tmp);          /* __FREE_CHECKED__ */
+          *tmp=tmp1;