From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 5 Aug 2016 21:07:00 +0000 (-0700)
Subject: ; Merge from origin/emacs-25
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~21^2~2822
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c5823cdae3de078e6db58df25769011ef3e52f36;p=emacs.git

; Merge from origin/emacs-25

The following commit was skipped:

d039fc4 ; Auto-commit of loaddefs files.
---

c5823cdae3de078e6db58df25769011ef3e52f36