Merge branch 'maint'
commit79b36b6a8dad24f90eb8e35cebe0a5d0f1ad0aac
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 21 Feb 2018 14:04:37 +0000 (21 15:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 21 Feb 2018 14:04:37 +0000 (21 15:04 +0100)
treef35ebe3a63d9bb11dfe338675e31086498f44d66
parent70b029c6a815320f90c916e0670da51ddd49363e
parent6655429b8d7ee686a8300b61af587599cd656a22
Merge branch 'maint'
lisp/org-capture.el
lisp/org-clock.el