From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 30 Jan 2016 21:56:23 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2789
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d231aad9a24eda1e36e0b33d96f31aa7e29a737;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

7b14da4 Bump version to 25.0.90
6f607a9 ; Auto-commit of loaddefs files.
---

2d231aad9a24eda1e36e0b33d96f31aa7e29a737