Merge branch 'maint'
commitcdacaa5e879272999d483409f51e7bbf0254d1ba
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 4 Feb 2018 22:33:41 +0000 (4 23:33 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 4 Feb 2018 22:33:41 +0000 (4 23:33 +0100)
tree6cb257c8121436661f01006cd6843b517956e3bc
parentf500d7c7f6b82be5f543cd974084adf531e93e69
parente6f891e7aad5f3aae4ca90ace897060b499600f5
Merge branch 'maint'
lisp/org-clock.el