Merge from emacs-23

[gnu-emacs] / lisp / epa.el

diff --git a/lisp/epa.el b/lisp/epa.el
index 687a31a8c3acd9c0d4d20126ca5a92fb222c8750..5cb57bc7a3981a5b2de0ff654b5dfd33b2164446 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -1,7 +1,5 @@
 ;;; epa.el --- the EasyPG Assistant
-
-;; Copyright (C) 2006, 2007, 2008, 2009, 2010
-;;   Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG