]> git.eshelyaron.com Git - emacs.git/commit
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)
commit0dfe7002a6b6f330b981e2d40f372bf71eeac1df
tree3a5c701604b3193360d3f42ea0c213aae6ad6a4e
parent8e07ea1a05e801e52061e880aa36b7cec5895f5a
parent9869d6f612e94437ac4a998454ad2d4f833a6ad8
Merge from origin/emacs-24

The following commit was skipped:

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