Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 821d897c9948cc5df2f9c862d9aebbc9c47f60bb..1c057848eadb82a203b84c7cf55d30bd0e51ad9b 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -5956,7 +5956,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012  Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.