From: John Wiegley <johnw@newartisans.com>
Date: Tue, 12 Jan 2016 06:48:09 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2819^2~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=540bfa7680268a55fc617ffb822e962cb9fb6c59;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

372d00a ; Auto-commit of loaddefs files.
---

540bfa7680268a55fc617ffb822e962cb9fb6c59