From: Glenn Morris <rgm@gnu.org>
Date: Sun, 11 Jun 2017 23:20:40 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~521^2~125
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=30963b4ef98365f467f40bdb04068efa327328b9;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

50b4f85720a ; Bump Emacs version past 25.2
---

30963b4ef98365f467f40bdb04068efa327328b9