Merge from origin/emacs-25

[gnu-emacs] / lisp / ChangeLog.7

diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index 7c55397028622cbea46e1f14c9ee6a2652c3b396..c072ce442a1b2591dadbdbffc2f4fe45225e2ad3 100644 (file)
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23110,7 +23110,8 @@ See ChangeLog.6 for earlier changes.
 ;; coding: utf-8
 ;; End:
 
-       Copyright (C) 1997-1998, 2001-2014 Free Software Foundation, Inc.
+       Copyright (C) 1997-1998, 2001-2016 Free Software Foundation,
+       Inc.
 
   This file is part of GNU Emacs.