From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 24 Apr 2016 19:49:21 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2160
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=77f497d292ace3e841827a7b12a18be5f78fe425;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

5c587fd Bump version to 25.0.93
---

77f497d292ace3e841827a7b12a18be5f78fe425