Merge changes made in Gnus trunk.

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

diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 2271f10..f1c9315 100644 (file)
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3247,8 +3247,7 @@
                Set current buffer variables from defaults
                in case user's init file has changed them.
 
-    Copyright (C) 1985-1986, 2001-2011
-      Free Software Foundation, Inc.
+  Copyright (C) 1985-1986, 2001-2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
 
@@ -3264,4 +3263,3 @@
 
   You should have received a copy of the GNU General Public License
   along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-