Merge from emacs-23

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

diff --git a/lisp/org/org-html.el b/lisp/org/org-html.el
index 47e82319873f0e9c407f9c32880c93d338230975..8be5709e1de4158a5e5f1e152c450d16ed5acf10 100644 (file)
--- a/lisp/org/org-html.el
+++ b/lisp/org/org-html.el
@@ -1,6 +1,6 @@
 ;;; org-html.el --- HTML export 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>