Merge branch 'maint'
commitaa3917ad471602c5d16f6502728867b52430171c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Jan 2016 19:49:18 +0000 (3 20:49 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 3 Jan 2016 19:49:18 +0000 (3 20:49 +0100)
tree66624ef3f79a25142f46bef305042bb2c442f8fa
parent4b7b201c77c27a9403e5be42602bcdef742db06b
parent3d4c4676737b3516adf9a12f03dd1ed7b67e3477
Merge branch 'maint'
lisp/org-clock.el