Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
112227:07e52ed69b5d | 112228:417b1e4d63cd |
---|---|
1 ;;; epa.el --- the EasyPG Assistant | 1 ;;; epa.el --- the EasyPG Assistant |
2 | 2 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
3 ;; Copyright (C) 2006, 2007, 2008, 2009, 2010 | |
4 ;; Free Software Foundation, Inc. | |
5 | 3 |
6 ;; Author: Daiki Ueno <ueno@unixuser.org> | 4 ;; Author: Daiki Ueno <ueno@unixuser.org> |
7 ;; Keywords: PGP, GnuPG | 5 ;; Keywords: PGP, GnuPG |
8 | 6 |
9 ;; This file is part of GNU Emacs. | 7 ;; This file is part of GNU Emacs. |