Commit f9fabb2b authored by Michael Albinus's avatar Michael Albinus

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/net/tramp.el
parents 570edf25 b0f3a495
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