diff options
| author | Joakim Verona | 2011-12-28 04:12:56 +0100 |
|---|---|---|
| committer | Joakim Verona | 2011-12-28 04:12:56 +0100 |
| commit | bb29f044aa967831cd664c54eba0de0c701436ce (patch) | |
| tree | 1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/ChangeLog.11 | |
| parent | 3c935a7e996701244d166f684119f0ff97e25496 (diff) | |
| parent | 5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff) | |
| download | emacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip | |
upstream i think
Diffstat (limited to 'lisp/ChangeLog.11')
| -rw-r--r-- | lisp/ChangeLog.11 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11 index c80091e4657..38a5530fbfc 100644 --- a/lisp/ChangeLog.11 +++ b/lisp/ChangeLog.11 | |||
| @@ -6728,11 +6728,11 @@ | |||
| 6728 | 2004-05-28 Simon Josefsson <jas@extundo.com> | 6728 | 2004-05-28 Simon Josefsson <jas@extundo.com> |
| 6729 | 6729 | ||
| 6730 | * mail/smtpmail.el (smtpmail-open-stream): | 6730 | * mail/smtpmail.el (smtpmail-open-stream): |
| 6731 | Bind starttls-extra-arguments too, if starttls.el uses GNUTLS. | 6731 | Bind starttls-extra-arguments too, if starttls.el uses GnuTLS. |
| 6732 | 6732 | ||
| 6733 | 2004-05-26 Simon Josefsson <jas@extundo.com> | 6733 | 2004-05-26 Simon Josefsson <jas@extundo.com> |
| 6734 | 6734 | ||
| 6735 | * starttls.el: Merge with my GNUTLS based starttls.el. | 6735 | * starttls.el: Merge with my GnuTLS based starttls.el. |
| 6736 | (starttls-gnutls-program, starttls-use-gnutls) | 6736 | (starttls-gnutls-program, starttls-use-gnutls) |
| 6737 | (starttls-extra-arguments, starttls-process-connection-type) | 6737 | (starttls-extra-arguments, starttls-process-connection-type) |
| 6738 | (starttls-connect, starttls-failure, starttls-success): New variables. | 6738 | (starttls-connect, starttls-failure, starttls-success): New variables. |