From: John Wiegley <johnw@newartisans.com>
Date: Sat, 2 Apr 2016 21:51:34 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2261
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d6e164af0211eb18fad654d777549a019776e9ba;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

ed19f20 Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25...
---

d6e164af0211eb18fad654d777549a019776e9ba