From: John Wiegley <johnw@newartisans.com>
Date: Fri, 11 Mar 2016 21:32:13 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2351
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b7ad5db04ba068ac9cbcfb9a02291e957d093a32;p=emacs.git

; Merge from origin/emacs-25

The following commits were skipped:

6287381 ; Auto-commit of loaddefs files.
041a140 Bump version to 25.0.92
---

b7ad5db04ba068ac9cbcfb9a02291e957d093a32