Merge branch 'maint'
commit92e8c85381034e932309573076ed585acc5712c6
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 21 Jun 2017 20:57:44 +0000 (21 22:57 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 21 Jun 2017 20:57:44 +0000 (21 22:57 +0200)
treefb4e329eccb3d9b8219b32121f65ee3f9a70fb30
parente90b643b05912985032f978c3f6e3818d754e4af
parent521734d51fa2695257793886cb62d16851185d63
Merge branch 'maint'
lisp/org.el