Merge branch 'maint'
commit9a1f2082237b9e98bdc31a7b0e15cee2c2b31312
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Apr 2018 15:13:40 +0000 (27 17:13 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 27 Apr 2018 15:13:40 +0000 (27 17:13 +0200)
treeb07faf6303d8bd7598cfd2857d73e13f307739cf
parent2a8d944c85899a15a585c78b498ca6c6b5cc59f7
parent388254e0d0dcebafa2e2de970da96a2b08179444
Merge branch 'maint'
lisp/org.el