Merge branch 'maint'
commit36578fda469b1f5cc48f05c5e07e4aba8c5ae7cb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 Oct 2017 18:34:35 +0000 (31 19:34 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 Oct 2017 18:34:35 +0000 (31 19:34 +0100)
tree8a6a886f27feb32009f0c2783ed31504dbac649e
parent4388bdf85256e1a929dc6f3861c16ecc20de2e3e
parent8860fe2938661a18d1ffb7b6bbef5f7ad4fa9d67
Merge branch 'maint'
lisp/org.el