]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e07ea1 9869d6f)
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:47 +0000 (18:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Mar 2015 01:48:47 +0000 (18:48 -0700)
The following commit was skipped:

9869d6f Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.


Trivial merge