summaryrefslogtreecommitdiff
path: root/admin/bzrmerge.el
diff options
context:
space:
mode:
Diffstat (limited to 'admin/bzrmerge.el')
-rw-r--r--admin/bzrmerge.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/bzrmerge.el b/admin/bzrmerge.el
index 583f0d88866..2efb17603cd 100644
--- a/admin/bzrmerge.el
+++ b/admin/bzrmerge.el
@@ -1,6 +1,6 @@
;;; bzrmerge.el --- help merge one Emacs bzr branch to another
-;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2012 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: