Merge branch 'maint'

2016-01-22 22:59:29 +01:00 · 2016-01-22 22:59:29 +01:00 · 9d39c9a2ba
parent 58af2e01be 3bf19b30f0
commit 9d39c9a2ba
1 changed files with 1 additions and 1 deletions
--- a/lisp/ox-icalendar.el
+++ b/lisp/ox-icalendar.el
@ -904,8 +904,8 @@ This function assumes major mode for current buffer is
       (org-icalendar--vcalendar
 	org-icalendar-combined-name
 	user-full-name
-	org-icalendar-combined-description
 	(or (org-string-nw-p org-icalendar-timezone) (cadr (current-time-zone)))
+	org-icalendar-combined-description
 	contents)))
    (run-hook-with-args 'org-icalendar-after-save-hook file)))