Merge from emacs-23

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

diff --git a/lisp/org/org.el b/lisp/org/org.el
index eb919687325afc721402d3c23abbbc0c3fe3400b..33d01e48967d0d54098f0a5d906fb1a4c8dcc6fd 100644 (file)
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1,6 +1,6 @@
 ;;; org.el --- Outline-based notes management and organizer
 ;; Carstens outline-mode for keeping track of everything.
-;; 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>