Merge branch 'maint'
commitc1ebb6d221914feeb2cf7c5fa642de91c638e2b5
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 21 Apr 2018 09:26:54 +0000 (21 11:26 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 21 Apr 2018 09:26:54 +0000 (21 11:26 +0200)
treef06ea8eb65e0e84bf36502745dc5e8fa72a58748
parent56fe493618b67b54b57ea0a4b4329354bf46b90e
parentc75c574d580ca751e28881fcb6acc8a250adec88
Merge branch 'maint'
lisp/org-capture.el