Merge from emacs-23

[gnu-emacs] / lisp / vc / vc-hooks.el

diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el
index 37426eb25f2befda6329be9f935a105f0c784c30..38bc121e70952577b5c68804ab6bdd3d9decdea6 100644 (file)
--- a/lisp/vc/vc-hooks.el
+++ b/lisp/vc/vc-hooks.el
@@ -1,7 +1,7 @@
 ;;; vc-hooks.el --- resident support for version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;;   2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)