Merge from emacs-23

[gnu-emacs] / lisp / textmodes / enriched.el

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index c2711a7345c451d53bbfb519df7c2c3de18f21d5..1e46d9453f729c09d7f108b430d52d59f6d82dee 100644 (file)
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -1,7 +1,7 @@
 ;;; enriched.el --- read and save files in text/enriched format
 
-;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: wp, faces