Commit 0dfe7002 authored by Paul Eggert's avatar Paul Eggert

Merge from origin/emacs-24

The following commit was skipped:

9869d6f6 Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.
parents 8e07ea1a 9869d6f6
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment