Merge from emacs--rel--22

[bpt/emacs.git] / lisp / ChangeLog.9

diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 8f6177e..384e0f6 100644 (file)
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -20696,13 +20696,13 @@ See ChangeLog.8 for earlier changes.
 ;; End:
 
     Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007  Free Software Foundation, Inc.
+      2007, 2008  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
   GNU Emacs is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2, or (at your option)
+  the Free Software Foundation; either version 3, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,