Merge branch 'maint'
commit434d232ca7987a6ff89c69a63f8ae7c7b0290791
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Apr 2018 19:46:25 +0000 (12 21:46 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Apr 2018 19:46:25 +0000 (12 21:46 +0200)
tree6d33ea801cde39da1ade851a4049c33719431445
parent9a5557d715a47439fcef54444e27bcbdc2714717
parent1976c02af0c5bbbc49ec9698ea40871093078a09
Merge branch 'maint'
lisp/org.el