; Remove superfluous merge from emacs-25
commitbd2b14f20726e0f210a62edc610fac4c5bc45760
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 6 Apr 2016 08:26:07 +0000 (6 10:26 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 6 Apr 2016 08:26:07 +0000 (6 10:26 +0200)
treec17f1ea60f2294c77b4a2fe5a0f349c1ec198c37
parent728b1c7f139270bf0cbe93e33769d06b9903f20f
; Remove superfluous merge from emacs-25
lisp/net/tramp.el