Merge from emacs--rel--22

[bpt/emacs.git] / lisp / mh-e / ChangeLog.1

diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 1ef20c9..cc8cdb7 100644 (file)
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -165,7 +165,7 @@
 
        * mh-comp.el (mh-insert-auto-fields): Inset identity regardless of
        whether one was already set, since if one used a default identity
-       it would never be overridden.
+       it would never be overridden (closes SF #1204506).
 
 2005-06-02  Bill Wohler  <wohler@newt.com>
 
@@ -11407,8 +11407,23 @@
        (dist): Leave release in current directory.
 
 
-  Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+  Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
-  Copying and distribution of this file, with or without modification,
-  are permitted in any medium without royalty provided the copyright
-  notice and this notice are preserved.
+  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 3, or (at your option)
+  any later version.
+
+  GNU Emacs is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with GNU Emacs; see the file COPYING.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+  Boston, MA 02110-1301, USA.
+
+;; arch-tag: 2577172b-b1bf-4d87-acfb-c9d8780e8851