Merge from emacs-24; up to 117691

[gnu-emacs] / lisp / textmodes / text-mode.el

diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 6c97ce6372bcf79fad0ed98a27fdad2bfdb789ff..727697b5533fcffd52bb85b5650bc27059155f0e 100644 (file)
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -1,8 +1,9 @@
 ;;; text-mode.el --- text mode, and its idiosyncratic commands
 
-;; Copyright (C) 1985, 1992, 1994, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1992, 1994, 2001-2014 Free Software Foundation,
+;; Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: wp
 ;; Package: emacs