Commit 933f91a3 authored by Glenn Morris's avatar Glenn Morris
Browse files

; Merge from origin/emacs-25

The following commits were skipped:

16ef7539 Don't advertise s_client in tls.el docs
94a6c964 Remove s_client usage from tls.el
parents 030df01c 16ef7539
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment