Merge branch 'maint'
commit163c84f2ee6d6b9b8908cd78792bcad0c4d9f6b6
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Jul 2017 08:58:42 +0000 (10 10:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 10 Jul 2017 08:58:42 +0000 (10 10:58 +0200)
tree6ea4232a0a5ec8fdd4467c94165e04d621a5052a
parentf8d0ef1b526b225d79b06ffe92b1dc9c5ab0e712
parent60eda8e4ec43f57a1ff39f8cc352f124939d2d37
Merge branch 'maint'
lisp/org-clock.el