Merge branch 'maint'
commitf1bc02f03b8d58c4ab2080846fb43c1162008dab
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 12:41:41 +0000 (20 13:41 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 20 Jan 2018 12:41:41 +0000 (20 13:41 +0100)
treefadfa6e42a5304e10abf6c0e16c69354ef98fce0
parent1c8e687f47defbe26b9fc091f74bde2d00eb8b1b
parentc06f906f02e05f18df30157aa88cae2afc716abb
Merge branch 'maint'
lisp/org.el