Merge branch 'maint'
commitdcda03170d1fc4a15f510ae5dec4dbd8e463ff11
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 May 2017 22:35:12 +0000 (15 00:35 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 May 2017 22:35:12 +0000 (15 00:35 +0200)
tree6563053dbb345f4663602f5594060ed48e67ca61
parent8fba95ea8a5028b4550b3c73f151b558d3339eef
parent93e5d92383a9935160903d9da57f0bf33bc065ed
Merge branch 'maint'
lisp/org-clock.el