Merge branch 'maint'
commit9ed5674dcba25542166d8d27c56505f3377075c0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Jun 2017 14:32:08 +0000 (29 16:32 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 29 Jun 2017 14:32:08 +0000 (29 16:32 +0200)
tree3402351fd5ac4ec09c633e9fc02d02d455c9c684
parent840b907dfb40a90bc349106e65acee8357ff43bd
parentf409c13be16697a0ebda5d350a68e6351f5b6642
Merge branch 'maint'
lisp/org.el