From f674c89f7ced2f317f6383e6e572ef636ed7ab7a Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Thu, 5 Apr 2018 11:27:04 +0200
Subject: [PATCH] ; * ChangeLog.3: Update.

---
 ChangeLog.3 | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.3 b/ChangeLog.3
index abaed02b32e..436f04b630b 100644
--- a/ChangeLog.3
+++ b/ChangeLog.3
@@ -1,3 +1,24 @@
+2018-04-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp/emacs-lisp/inline.el: Clarify apparent typos
+
+2018-04-04  Ted Zlatanov  <tzz@lifelogs.com>
+
+	Allow sexp customization type in auth-sources
+
+	* lisp/auth-source.el (auth-sources): Allow sexp customization type.
+	Update the :version tag.
+
+	(cherry picked from commit 447da5b0d49b7aa14fa5d6969015770fdf9b9f92)
+
+2018-04-03  Nicolas Petton  <nicolas@petton.fr>
+
+	* etc/NEWS: Remove temporary markup.
+
+	* etc/AUTHORS: Update.
+
+	* ChangeLog.3: Update.
+
 2018-04-03  Michael Albinus  <michael.albinus@gmx.de>
 
 	Fix Bug#31022
@@ -59159,7 +59180,7 @@
 
 This file records repository revisions from
 commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to
-commit 56794ac6c7fb1ca1dd1fd8dfb0ac40e20901f2c0 (inclusive).
+commit 80d868ed1cf3fb1bf62c9b53e65d1034f20be227 (inclusive).
 See ChangeLog.1 for earlier changes.
 
 ;; Local Variables:
-- 
2.11.4.GIT