From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 5 Aug 2016 21:10:30 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1787
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fe3225830d0817d3d7eee1dfb92e0deec641c9c5;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

3d981dd Bump Emacs version to 25.1 for the first RC
---

fe3225830d0817d3d7eee1dfb92e0deec641c9c5