Merge branch 'maint'
commitaf824a9b397d72edb6577990e7c45c7ffd2064ef
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Feb 2018 17:00:38 +0000 (14 18:00 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Feb 2018 17:00:38 +0000 (14 18:00 +0100)
tree2108a24e74e57719679182c0db436b089bfc81b5
parent269ccd9590c88074aae19c37defb9d806f27a29a
parent1a5151c51d3f3118e19f732ae364c7b01921af7c
Merge branch 'maint'
lisp/org-clock.el