Merge branch 'maint'

lisp/ox-html.el

@@ -584,7 +584,7 @@ in order to mimic default behaviour:
   \"Format a drawer element for HTML export.\"
   contents\)"
   :group 'org-export-html
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type 'function)
 
@@ -639,7 +639,7 @@ TAGS      the tags (string or nil).
 
 The function result will be used in the section format string."
   :group 'org-export-html
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type 'function)
 
@@ -669,7 +669,7 @@ The function must accept six parameters:
 
 The function should return the string to be exported."
   :group 'org-export-html
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type 'function)
 

lisp/ox-odt.el

@@ -747,7 +747,7 @@ A rule consists in an association whose key is the type of link
 to consider, and value is a regexp that will be matched against
 link's path."
   :group 'org-export-odt
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type '(alist :key-type (string :tag "Type")
 		:value-type (regexp :tag "Path")))
@@ -760,7 +760,7 @@ A rule consists in an association whose key is the type of link
 to consider, and value is a regexp that will be matched against
 link's path."
   :group 'org-export-odt
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type '(alist :key-type (string :tag "Type")
 		:value-type (regexp :tag "Path")))
@@ -934,7 +934,7 @@ the application UI or through a custom styles file.
 
 See `org-odt--build-date-styles' for implementation details."
   :group 'org-export-odt
-  :version "8.0"
+  :version "24.4"
   :package-version '(Org . "8.0")
   :type 'boolean)