Merge branch 'maint'
commitb78a9badcd299ee7edd87cc3d8932a69c75df4e3
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Jan 2016 23:27:57 +0000 (12 00:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 11 Jan 2016 23:27:57 +0000 (12 00:27 +0100)
treef5d68ee8579bfb35920afdd37fce08baf6438b78
parenta9713669102364f2d0c31700f09b386a513f9a44
parent47c92146a9694bc187f4caae02e7bd658ce8aebf
Merge branch 'maint'
lisp/org-clock.el