Merge branch 'maint'
commit48284bafb2e9990e0a44253f86d62ec768f48a13
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 17 Feb 2017 13:38:45 +0000 (17 14:38 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 17 Feb 2017 13:38:45 +0000 (17 14:38 +0100)
treec0d13cc5db4ef2495212493b62e10983e12eb88a
parent67c84c161fa4e97c1f98ef1bbc72fa0f6098e1fd
parent7ca2e027a618e6435c762acbdb65c937d71bcc48
Merge branch 'maint'
lisp/org-clock.el