Merge branch 'maint'
commit9a0b519b4eb2a4edaf0aee6d6190ada792f28d19
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Feb 2017 21:53:30 +0000 (3 22:53 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 3 Feb 2017 21:53:30 +0000 (3 22:53 +0100)
tree9f2c6940b543f3b7612c6b5b746bfdf6d6e148f7
parente01000a94cdc043dfa2d754c3e0dc7d6f8b8a4ba
parent83cea905991b2761f98838cef9b867985d60c637
Merge branch 'maint'
lisp/org-clock.el
lisp/org.el