Merge branch 'maint'
commitcafa08334a44e205334ba020d8d765e1da71dbba
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 21 Jan 2018 22:27:05 +0000 (21 23:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 21 Jan 2018 22:27:05 +0000 (21 23:27 +0100)
tree53933b5e6917bbb8a7ddbe02b0312a64c857daa7
parent8d930a2d0975a52abbcf12085c2fe339cea823c9
parentffa5f3c5198c87454a9957f81380d52d2bbb96a0
Merge branch 'maint'
lisp/org-clock.el