Merge branch 'maint'
commit2e3270984332013b8df22d2995bdeba256534a63
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Feb 2017 20:32:28 +0000 (13 21:32 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 13 Feb 2017 20:32:28 +0000 (13 21:32 +0100)
tree9932bc7e7d67156932b10bc617611244578bfe70
parent5902b9c2a73434505a91ef4e52f8239e68e6ae75
parentb897ab72230b165c72556447ad042a2e41973602
Merge branch 'maint'
lisp/org-clock.el
testing/lisp/test-org-clock.el