From: Paul Eggert Date: Mon, 23 Mar 2015 17:17:43 +0000 (-0700) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2564^2~92 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7f55d4251806e4712762bef0a3ed41a53f850a58;p=emacs.git Merge from origin/emacs-24 The following commit was skipped: a4ff05a ChangeLog fix No need to merge to trunk, since it corrects a backported entry that should not appear in trunk. --- 7f55d4251806e4712762bef0a3ed41a53f850a58