Merge branch 'maint'
commitcc14aa6cfe22743a8a78a7126efa9a1da7cc2c14
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 7 Feb 2017 16:01:10 +0000 (7 17:01 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 7 Feb 2017 16:01:10 +0000 (7 17:01 +0100)
treec0aad72fa478754a2857147e1f077bd35544d8d3
parent2064b0a3933621a7d9db368454053aba4fa2ccc0
parentccf832e8317dbac7d3ac2b7dfbb515b1292a329c
Merge branch 'maint'
lisp/org-clock.el