From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 7 Dec 2016 20:39:08 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1172
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8209e0384441cafb67d779bbd17ea812269ca4cc;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

3674317 Bump Emacs version to 25.1.90
938e316 ; Revert "Bump Emacs version"
596289b Bump Emacs version
dcfe4d1 ; ChangeLog.2 update
---

8209e0384441cafb67d779bbd17ea812269ca4cc