From: Glenn Morris <rgm@gnu.org>
Date: Thu, 29 Aug 2019 18:11:23 +0000 (-0700)
Subject: Merge from origin/emacs-26
X-Git-Tag: emacs-27.0.90~1328^2~41
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e7f16f00e17c81b9550b4a96540b77bae6a4fc5d;p=emacs.git

Merge from origin/emacs-26

70829f8 ; ChangeLog.3 update

# Conflicts:
#	ChangeLog.3
---

e7f16f00e17c81b9550b4a96540b77bae6a4fc5d
diff --cc ChangeLog.3
index 48d1c66306e,de51077a0e4..747fd5627ca
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@@ -1,4 -1,8 +1,9 @@@
 -2019-08-22  Nicolas Petton  <nicolas@petton.fr>
++2019-08-29  Nicolas Petton  <nicolas@petton.fr>
+ 
+ 	* etc/AUTHORS: Update.
+ 
 -2019-08-21  Nicolas Petton  <nicolas@petton.fr>
++2019-08-29  Nicolas Petton  <nicolas@petton.fr>
 +2019-08-29  Nicolas Petton  <nicolas@petton.fr>
  
  	* etc/NEWS: Delete temporary markup.