Merge from origin/emacs-24

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

diff --git a/lisp/org/org-feed.el b/lisp/org/org-feed.el
index 91bf33479536870fbb3269454a049f48f3af1991..f01212421584eabf4ce913a75fef09218d89343b 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-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2009-2015 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -695,4 +695,8 @@ formatted as a string, not the original XML data."
 
 (provide 'org-feed)
 
+;; Local variables:
+;; generated-autoload-file: "org-loaddefs.el"
+;; End:
+
 ;;; org-feed.el ends here