Merge branch 'maint'
commit8a0c89244d69198d326ea00e8aae5bf49e760ca5
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 31 Aug 2017 21:15:56 +0000 (31 23:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 31 Aug 2017 21:15:56 +0000 (31 23:15 +0200)
treef5a5cdda8228e8ffe2ad067239502ce8dacaa49b
parentab6f43fcac75666689b4d06c39c4538c50d26064
parent1654a5a98ab28fea3b74536e423bfffddfd86531
Merge branch 'maint'
lisp/org-capture.el