Merge from origin/emacs-25

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

diff --git a/lisp/org/ox-org.el b/lisp/org/ox-org.el
index 4bee45ab0140e55b14e9a1cc87cd43c140b82b7b..6221c70b88a1f159bcedd4306ece548dc16d6fa7 100644 (file)
--- a/lisp/org/ox-org.el
+++ b/lisp/org/ox-org.el
@@ -1,6 +1,6 @@
 ;;; ox-org.el --- Org Back-End for Org Export Engine
 
-;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2013-2016 Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <n.goaziou@gmail.com>
 ;; Keywords: org, wp