Merge from emacs-23

[gnu-emacs] / lisp / format.el

diff --git a/lisp/format.el b/lisp/format.el
index b4277ef6df0d4bb36b6dd775458c4c19f36dc1c5..59cb1a2b139ed0ecb0b668116bb212a266a70e9b 100644 (file)
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1,7 +1,7 @@
 ;;; format.el --- read and save files in multiple formats
 
 ;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
-;;   2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;;   2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Package: emacs