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

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e8363efde2d83f1b622a2a909cc672b49c115167..d2224d04b74bf4d03609082d1addb7f5f4c2f113 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11867,7 +11867,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.