Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-09-29 22:02:10 +02:00
commit 7f2b2557fe
1 changed files with 1 additions and 0 deletions

View File

@ -2974,6 +2974,7 @@ The details of what will be saved are regulated by the variable
;; Local variables: ;; Local variables:
;; generated-autoload-file: "org-loaddefs.el" ;; generated-autoload-file: "org-loaddefs.el"
;; coding: utf-8
;; End: ;; End:
;;; org-clock.el ends here ;;; org-clock.el ends here