Merge from emacs-23

[gnu-emacs] / lisp / org / org-crypt.el

diff --git a/lisp/org/org-crypt.el b/lisp/org/org-crypt.el
index 1d761049bbb682f695627efba9be5f9dc8aff95c..4d35cdcf71c458b5040c26a30426ea0ea86f5873 100644 (file)
--- a/lisp/org/org-crypt.el
+++ b/lisp/org/org-crypt.el
@@ -1,6 +1,6 @@
 ;;; org-crypt.el --- Public key encryption for org-mode entries
 
-;; Copyright (C) 2007, 2009, 2010  Free Software Foundation, Inc.
+;; Copyright (C) 2007, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 ;; Emacs Lisp Archive Entry
 ;; Filename: org-crypt.el