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 6e680718642a3c8c5b1f9223f385deebd9eaf8f4..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-2014 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