Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
commit9869d6f612e94437ac4a998454ad2d4f833a6ad8
authorMichael Albinus <michael.albinus@gmx.de>
Sat, 7 Mar 2015 20:02:04 +0000 (7 21:02 +0100)
committerMichael Albinus <michael.albinus@gmx.de>
Sat, 7 Mar 2015 20:02:04 +0000 (7 21:02 +0100)
treeb0efb7cec1aa67d2503706644a70ccb61565902d
parent344c6adab932fd329c11d76d7a0fff12d250bba2
Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with 

Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.
lisp/ChangeLog
lisp/net/tramp.el