From acaf905b1130aae80fa59d2c861ffd4c8eb75486 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 5 Jan 2012 01:46:05 -0800
Subject: Add 2012 to FSF copyright years for Emacs files

---
 admin/bzrmerge.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'admin/bzrmerge.el')

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: 
-- 
cgit v1.2.1