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

; Merge from origin/emacs-25

The following commit was skipped:

a3487a8 Fix bug#25087
---

33a2f93aadc8da93ca5948c6b312eb3e1df25bf1