Merge branch 'maint'
commit5ad085f34c1688ef9f7c7d82789587d850cf3716
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 6 Mar 2018 09:15:22 +0000 (6 10:15 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 6 Mar 2018 09:15:22 +0000 (6 10:15 +0100)
treead110fb2e89625387e339fb5c397b618cbece426
parentf7b120e566fb85f37c300a7ae151eb81b6740eaf
parent9449939ca063500ba78438b65c9dde59390b1920
Merge branch 'maint'
lisp/org-clock.el