aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fb12913441..19ef782932b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,8 @@
7 7
82014-11-25 Teodor Zlatanov <tzz@lifelogs.com> 82014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
9 9
10 * net/gnutls.el (gnutls): Set :group to 'comm so it's near NSM.
11
10 * net/nsm.el (nsm-check-tls-connection, nsm-save-host) 12 * net/nsm.el (nsm-check-tls-connection, nsm-save-host)
11 (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'. 13 (nsm-warnings-ok-p): Use `gnutls-peer-status-warning-describe'.
12 14