Merge branch 'maint'
commitc9bbc4eca78a4519517dd1ec3f80fd47af8cb4a5
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Dec 2017 22:21:34 +0000 (15 23:21 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 15 Dec 2017 22:21:34 +0000 (15 23:21 +0100)
tree64f47dcb0fd6d6890551faa69740331753d034a1
parent9a249775710c99a5bb5d3222185338301fe7e8a8
parent5e30bbcd34fe1d141362f2e273b8ca549cd821bb
Merge branch 'maint'
lisp/org.el