Merge branch 'hotfix'

Conflicts: lisp/org.el
2012-04-03 09:46:34 +02:00 · 2012-04-03 09:46:34 +02:00 · 2da8a36229
parent 3b04635542 a8c6802345
commit 2da8a36229
1 changed files with 2 additions and 3 deletions
--- a/lisp/org.el
+++ b/lisp/org.el
@ -2841,9 +2841,8 @@ be the favorite working time of John Wiegley :-)"
 For example, if `org-extend-today-until' is 8, and it's 4am, then the
 \"effective time\" of any timestamps between midnight and 8am will be
 23:59 of the previous day."
-  :group 'boolean
-  :version "24.1"
-  :type 'integer)
+  :group 'org-time
+  :type 'boolean)

 (defcustom org-edit-timestamp-down-means-later nil
  "Non-nil means S-down will increase the time in a time stamp.