Merge from origin/emacs-25

[gnu-emacs] / admin / gitmerge.el

diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index 69e4d28852292e04da90671ad7a167f9b6b23478..ae863fdecb5f14d5df2bfd7988ace0823e4a3eee 100644 (file)
--- a/admin/gitmerge.el
+++ b/admin/gitmerge.el
@@ -1,6 +1,6 @@
 ;;; gitmerge.el --- help merge one Emacs branch into another
 
-;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2016 Free Software Foundation, Inc.
 
 ;; Authors: David Engster <deng@randomsample.de>
 ;;          Stefan Monnier <monnier@iro.umontreal.ca>