Merge from origin/emacs-25

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

diff --git a/lisp/org/org-macro.el b/lisp/org/org-macro.el
index 5b890346dd7a194314c852336cae6a835c8fd9bd..d8e2fd3534f2eee8be68567ad3032550d5c869ce 100644 (file)
--- a/lisp/org/org-macro.el
+++ b/lisp/org/org-macro.el
@@ -1,6 +1,6 @@
 ;;; org-macro.el --- Macro Replacement Code for Org Mode
 
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: outlines, hypermedia, calendar, wp