Merge branch 'maint'
commit5c1d9c53f0e2db612b97183012b6b1d84222386d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 11:27:39 +0000 (7 13:27 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 7 Aug 2017 11:27:39 +0000 (7 13:27 +0200)
treedbc2243f6e83ca4ef563ef5ec3949f9363ca3fef
parentd777d5e0b7d288aff8b461e16f86c7590dc0b86d
parent43a1d5e920116f59ac2a8246b95394330839b9cc
Merge branch 'maint'
lisp/org-clock.el