From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 18 Apr 2016 21:05:31 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2202
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3aa73b04e81ebc396892b14e5e9fa78a13ff85d1;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

1b98a68 Fix Bug#20637.  Do not merge to master
---

3aa73b04e81ebc396892b14e5e9fa78a13ff85d1