Merge branch 'maint'
commit0d35d9d0d6c394fb4b2b11a4300a4fe758629b2a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 08:05:08 +0000 (17 10:05 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 08:05:08 +0000 (17 10:05 +0200)
tree90f96ffc12da8ee0f16c8b32a56cb2e5e752403b
parent4e5bc38040a68bb62e592b06ca0a2979b442f021
parent6bd52105358ee95548d065b4ec890f451779cc90
Merge branch 'maint'
lisp/org-clock.el