Merge remote-tracking branch 'origin/master' into feature/tramp-thread-safe

author Michael Albinus <michael.albinus@gmx.de>

Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)

committer Michael Albinus <michael.albinus@gmx.de>

Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)
author Michael Albinus <michael.albinus@gmx.de>
Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)
committer Michael Albinus <michael.albinus@gmx.de>
Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)
diff --cc doc/lispref/elisp.texi
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
author	Michael Albinus <michael.albinus@gmx.de>
	Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)
committer	Michael Albinus <michael.albinus@gmx.de>
	Mon, 10 Sep 2018 11:13:36 +0000 (13:13 +0200)
		1	2
doc/lispref/elisp.texi	patch \|	diff1 \|	diff2 \|	blob \| history
etc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/net/tramp.el	patch \|	diff1 \|	diff2 \|	blob \| history