Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master."
commit81822823191a8b7dc5f016780c6b667e7b68228c
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 7 Mar 2015 20:01:01 +0000 (7 21:01 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 7 Mar 2015 20:01:01 +0000 (7 21:01 +0100)
tree148d74fda7cd72fdfa0d7e3654770afd9b3cf742
parent5ab767b8dcea50b4d02c3910d19c223a5402f99d
Revert "Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with "

This reverts commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d.
lisp/ChangeLog
lisp/net/tramp.el