summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2015-03-07 21:01:01 +0100
committerMichael Albinus <michael.albinus@gmx.de>2015-03-07 21:01:01 +0100
commit81822823191a8b7dc5f016780c6b667e7b68228c (patch)
tree148d74fda7cd72fdfa0d7e3654770afd9b3cf742 /lisp/emacs-lisp
parent5ab767b8dcea50b4d02c3910d19c223a5402f99d (diff)
downloademacs-81822823191a8b7dc5f016780c6b667e7b68228c.tar.gz
emacs-81822823191a8b7dc5f016780c6b667e7b68228c.tar.bz2
emacs-81822823191a8b7dc5f016780c6b667e7b68228c.zip
Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master."
This reverts commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d.
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions