Merge branch 'maint'
commita36d18caa47f5cc9c315ad948c8b1b1de2065087
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Dec 2017 22:52:06 +0000 (13 23:52 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 13 Dec 2017 22:52:06 +0000 (13 23:52 +0100)
treee972825a85a49f1588097a373bbdc552eb536a43
parent993f76a7b43efb154381c48f687a9aa8ba1a1d2a
parent08fa2ae056e4f34bf6960098cafadd72aa811bfa
Merge branch 'maint'
lisp/org.el