From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:39:08 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1170
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=32b46fc82f1275d8e0c86340546db366dea48c8c;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

4606529 ; ChangeLog.2 update
---

32b46fc82f1275d8e0c86340546db366dea48c8c