Merge branch 'master' into cairo

[gnu-emacs] / lisp / chistory.el

diff --git a/lisp/chistory.el b/lisp/chistory.el
index 9a77793b1e1f849133556f3c58a0855b167b8fa8..d7326589227878c1559537c7b4241e23452bd0bf 100644 (file)
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -1,9 +1,9 @@
 ;;; chistory.el --- list command history
 
-;; Copyright (C) 1985, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.