Merge from origin/emacs-24

[gnu-emacs] / doc / lispintro / emacs-lisp-intro.texi

diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index f915d0da8abb703e33601566cf225ed276d33c1c..b6eff2de0dc4d31b0f82b5a89c8af379b1b03cfe 100644 (file)
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -113,7 +113,7 @@ Edition @value{edition-number}, @value{update-date}
 Distributed with Emacs version @value{EMACSVER}.
 @end ifnottex
 @sp 1
-Copyright @copyright{} 1990--1995, 1997, 2001--2014 Free Software
+Copyright @copyright{} 1990--1995, 1997, 2001--2015 Free Software
 Foundation, Inc.
 @sp 1