| commit | 0dfe7002a6b6f330b981e2d40f372bf71eeac1df | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 9 Mar 2015 01:48:47 +0000 (8 18:48 -0700) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Mon, 9 Mar 2015 01:48:47 +0000 (8 18:48 -0700) | ||
| tree | 3a5c701604b3193360d3f42ea0c213aae6ad6a4e | treesnapshot (tar.gz zip) |
| parent | 8e07ea1a05e801e52061e880aa36b7cec5895f5a | commitdiff |
| parent | 9869d6f612e94437ac4a998454ad2d4f833a6ad8 | commitdiff |
Merge from origin/emacs-24
The following commit was skipped:
9869d6f Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
The following commit was skipped:
9869d6f Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.