Merge branch 'maint'
commit7bbd62cef400b74c3b0409ba74678db821ddb7c6
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Mar 2017 09:57:11 +0000 (19 10:57 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Mar 2017 09:57:11 +0000 (19 10:57 +0100)
treef1f2e6e949a257fd623c490ea2491cb3b09bd1f3
parent36c7cfe9eb50d5a3d6d21e59707f1c779f549092
parentd2835ab54d90408805f5454d852760a27f5aa65a
Merge branch 'maint'
lisp/org-clock.el