Merge from origin/emacs-24

[gnu-emacs] / lisp / novice.el

diff --git a/lisp/novice.el b/lisp/novice.el
index b8e4a268b23c3409bdb155fe5f4fd9a6b6b35492..ce6e16f111789a4cd894d2d5acad467d918afdcd 100644 (file)
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,8 +1,9 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
-;; Copyright (C) 1985-1987, 1994, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1994, 2001-2015 Free Software Foundation,
+;; Inc.
 
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: internal, help
 
 ;; This file is part of GNU Emacs.