Merge with tlr

diff --cc ChangeLog
index f83ee573105388b157f6d385c1addead1bf82253,7039481dadd9fd38ccd9d85a1e7ed25f242c9472..aeea96cdff8ca16f4f8542c23f15403ddf46330a
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,3 +1,29 @@@
++2007-05-20 00:29 -0700  Brendan Cully  <brendan@kublai.com>  (a0e038310f42)
++
++      * smtp.c: Forget SMTP password if authentication fails.  Thanks to
++      Gregory Shapiro for the initial patch (I've moved the reset from
++      smtp_auth_sasl up to smtp_auth, and used the account API instead
++      of twiddling account bits by hand). Closes #2872.
++
++2007-05-15 21:05 +0200  Thomas Roessler  <roessler@does-not-exist.org>  (33af2883d52b)
++
++      * curs_main.c: Jump to the next *sub*-thread when tag-subthread is
++      invoked, not to the next thread.
++
 +2007-05-08 12:54 -0700  Rocco Rutte  <pdmef@gmx.net>  (763bd781d108)
 +
 +      * rfc3676.c: f=f: flush buffer contents (if any) after reading input
 +      Otherwise mutt maybe won't show the last line if it's supposed to
 +      continue.
 +
 +2007-05-07 11:50 -0700  Brendan Cully  <brendan@kublai.com>  (89a3e1c5c28b)
 +
 +      * OPS, UPDATING, curs_main.c, functions.h: Rename next-folder to next-
 +      unread-mailbox. Remove default binding.
 +
 +      * muttlib.c: Use signed arithmetic in mutt_gecos_name to avoid an
 +      overflow. Closes #2885.
 +
  2007-05-02 10:50 -0700  N.J. Mann  <njm@njm.f2s.com>  (f6861b85f22b)
  
        * OPS, curs_main.c, functions.h: Add next-folder command