Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / vc / ediff-diff.el

diff --git a/lisp/vc/ediff-diff.el b/lisp/vc/ediff-diff.el
index aa7c9007200333bd512fae0c04f14d2983a8cdff..b4d986fb036ffb3a0ff459a2d8a444fb67f20cb6 100644 (file)
--- a/lisp/vc/ediff-diff.el
+++ b/lisp/vc/ediff-diff.el
@@ -1,6 +1,6 @@
 ;;; ediff-diff.el --- diff-related utilities
 
-;; Copyright (C) 1994-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff