From: John Wiegley <johnw@newartisans.com>
Date: Fri, 4 Mar 2016 07:53:27 +0000 (-0800)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: emacs-26.0.90~2379
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5c6cc95c9a56b19410e314c0d98d37cad87a9bd0;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

733fb9f ; Auto-commit of loaddefs files.
---

5c6cc95c9a56b19410e314c0d98d37cad87a9bd0