From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Mar 2015 01:48:47 +0000 (-0700)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~193
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0dfe7002a6b6f330b981e2d40f372bf71eeac1df;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

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

0dfe7002a6b6f330b981e2d40f372bf71eeac1df