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

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

diff --git a/lisp/vc/ediff-ptch.el b/lisp/vc/ediff-ptch.el
index b6a59ce277034d87c868a7ed46abe5412c0a6832..64f4ee4a6ac49659c25f3b74cc3f63ea55b517f5 100644 (file)
--- a/lisp/vc/ediff-ptch.el
+++ b/lisp/vc/ediff-ptch.el
@@ -1,6 +1,6 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
-;; Copyright (C) 1996-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff