From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 23 Mar 2016 18:24:28 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2293
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77557ce8ca903d5358808d34c9d80fc4be8e1759;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

1e5327c ; Backport ChangeLog.2 fixes from master
---

77557ce8ca903d5358808d34c9d80fc4be8e1759