From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:07 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~16
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c043d9731b499a241830d705e9055c9e42ccf28c;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

9825305 Merge from gnulib
---

c043d9731b499a241830d705e9055c9e42ccf28c