Merge branch 'maint'
commit4b2006db3d040a8b9683cefcac1ec68b0d12a555
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 1 Feb 2018 21:43:19 +0000 (1 22:43 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 1 Feb 2018 21:43:19 +0000 (1 22:43 +0100)
treef3cb97a4d0468e39e1e2358f9d1d2cc4eab2907b
parente490d2766f77c79075998e97626a3eec31560909
parente570e964a30bb8e719460ef27d919f8d3ab53104
Merge branch 'maint'
lisp/org-clock.el
lisp/org-compat.el