Merge branch 'maint'
commitb5d8be4a5fa99567624c46aa1f4873a1d424bbcd
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Feb 2017 08:39:50 +0000 (19 09:39 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Feb 2017 08:39:50 +0000 (19 09:39 +0100)
tree595396845c9b1c591d93f90aba77722e7e18c7ef
parent35822684c125dbea5f22608cdb9ea2a40c792320
parentc5ab7958b7074ae8da734e9e6180666cca4c2c62
Merge branch 'maint'
lisp/org-clock.el