Merge from emacs--rel--22

[gnu-emacs] / lisp / ChangeLog.6

diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index 502fb5245a8118148dfb763eb0900599731f6067..5475a7ee1002cc018659ddcbbf1c301d2101a950 100644 (file)
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8029,7 +8029,7 @@ See ChangeLog.5 for earlier changes.
 
   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 3, or (at your option)
+  the Free Software Foundation; either version 2, or (at your option)
   any later version.
 
   GNU Emacs is distributed in the hope that it will be useful,