Merge changes from emacs-23 branch

[gnu-emacs] / lisp / version.el

diff --git a/lisp/version.el b/lisp/version.el
index 770409b948743eda1a0dbd2a477a4a2455baa6ba..d28a300458518f8ac47fc8ab5e9b0427526c09e1 100644 (file)
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,11 +1,11 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 1985, 1992, 1994-1995, 1999-2011
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
+;; Package: emacs
 
 ;; This file is part of GNU Emacs.
 
@@ -87,5 +87,4 @@ to the system configuration; look at `system-configuration' instead."
 ;;version-control: never
 ;;End:
 
-;; arch-tag: e60dc445-6218-4a4c-a7df-f15a818642a0
 ;;; version.el ends here