Merge from emacs-23

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

diff --git a/lisp/org/org-archive.el b/lisp/org/org-archive.el
index e56b01f952a3c39013bfbe7c2d4efcdf8e90f40d..ae52df65bdd39a2b6a4d98a700d4c12a1160ccdc 100644 (file)
--- a/lisp/org/org-archive.el
+++ b/lisp/org/org-archive.el
@@ -1,6 +1,6 @@
 ;;; org-archive.el --- Archiving for Org-mode
 
-;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>