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

[gnu-emacs] / lisp / url / ChangeLog

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 6da1e545be51e2fca609508ce486d407f62c58c6..969d3c7d26926e33c98a6843efa454a40940e3f6 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -2801,7 +2801,8 @@
 ;; coding: utf-8
 ;; End:
 
-       Copyright (C) 1999, 2001-2002, 2004-2012  Free Software Foundation, Inc.
+       Copyright (C) 1999, 2001-2002, 2004-2013 Free Software
+       Foundation, Inc.
 
   This file is part of GNU Emacs.