From 6a730f61ccd2560a2a97acd09032cb4e9e2dc0cf Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sat, 27 Nov 2010 15:39:02 +0100 Subject: [PATCH] Merge resolved. --- lisp/ChangeLog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3a3535261..944f32408 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -15,6 +15,14 @@ (nnir-artlist-artitem-group, nnir-artlist-artitem-number) (nnir-artlist-artitem-rsv, nnir-sort-groups-by-server): Obsolete. +2010-11-27 Lars Magne Ingebrigtsen + + * proto-stream.el: New library to provide protocol-specific + TLS/STARTTLS connections for IMAP, NNTP, SMTP, POP3 and similar + protocols. + + * nnimap.el (nnimap-open-connection): Use it. + 2010-11-26 Julien Danjou * color.el: Rename various rgb functions to srgb. -- 2.34.1