From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 18 Jun 2016 22:47:01 +0000 (+0200)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~1840^2~213
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8085d5fcc4240a39458ead26ae2279590bb9f629;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

e18ee60 Bump version to 25.0.95
---

8085d5fcc4240a39458ead26ae2279590bb9f629