Merge from origin/emacs-24

[gnu-emacs] / lisp / play / life.el

diff --git a/lisp/play/life.el b/lisp/play/life.el
index 438ff92c40271a3749f02d19d3d4305aca95514e..5bf8a9b57b7c5634541373d852c8c468284c81bc 100644 (file)
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,9 +1,9 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
-;; Copyright (C) 1988, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1988, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: games
 
 ;; This file is part of GNU Emacs.