Mercurial > emacs
diff lisp/epa.el @ 112228:417b1e4d63cd
Merge from emacs-23
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 14 Jan 2011 12:18:41 -0500 |
| parents | 56b71cddc9c5 376148b31b5e |
| children | 61f7601898b1 |
line wrap: on
line diff
--- a/lisp/epa.el Fri Jan 14 16:06:17 2011 +0100 +++ b/lisp/epa.el Fri Jan 14 12:18:41 2011 -0500 @@ -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