; Remove unwanted merge from emacs-25
commit582962a3a184135047c5809b1172691a1c5f2586
authorMichael Albinus <michael.albinus@gmx.de>
Tue, 22 Mar 2016 19:37:02 +0000 (22 20:37 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Tue, 22 Mar 2016 19:37:02 +0000 (22 20:37 +0100)
treed6a14f30725943bdb8eb3c5b6839a705cee090c2
parentc4f4e643daac8438722885f6291f9fc700196faa
; Remove unwanted merge from emacs-25
test/lisp/net/tramp-tests.el