Merge from emacs-23

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

diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 32da49b1cb87dc46615da7e76f9ddd1836f7fe34..27a96f7be236136d689176e08f0dca1b00574aed 100644 (file)
--- a/lisp/org/org-feed.el
+++ b/lisp/org/org-feed.el
@@ -1,6 +1,6 @@
 ;;; org-feed.el --- Add RSS feed items to Org files
 ;;
-;; Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp