Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

1 files changed, 8 insertions, 2 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 88ce1450d7f..b32d7004517 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,8 +1,14 @@
+2014-12-24  Glenn Morris  <rgm@gnu.org>
+
+        * authors.el (authors-obsolete-files-regexps)
+        (authors-ignored-files, authors-valid-file-names)
+        (authors-renamed-files-alist, authors-renamed-files-regexps):
+        Additions.
+
 2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
 
         * notes/unicode: Track leim/quail file renames.
-        Correct coding system
-        of lisp/international/titdic-cnv.el.
+        Correct coding system of lisp/international/titdic-cnv.el.
 
 2014-12-14  Glenn Morris  <rgm@gnu.org>