Merge branch 'maint'
commitc0924db32ce5e684d911dd2aa3452c2e1d8fd4fe
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Aug 2016 22:27:33 +0000 (20 00:27 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Aug 2016 22:27:33 +0000 (20 00:27 +0200)
treed06f251bc0b43e17a22171d6c13e222b2d72933f
parent6cb291a87b79c8b07fb3b0a6ed1773f9b2b660a8
parent589e96321b6eff3813cce305d370f883636cb2a3
Merge branch 'maint'
lisp/org-clock.el