merge trunk

[bpt/emacs.git] / lisp / master.el

diff --git a/lisp/master.el b/lisp/master.el
index 5c1bd2f..1ea0a24 100644 (file)
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -1,7 +1,6 @@
 ;;; master.el --- make a buffer the master over another buffer
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999-2011  Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
@@ -159,5 +158,4 @@ See `recenter'."
 
 (provide 'master)
 
-;; arch-tag: dca08daa-8127-45ae-b77e-b135160dce98
 ;;; master.el ends here