Merge branch 'maint'
commit0c9feb660a5ae34e369707a12189d30c5cf56ed1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Jul 2017 12:26:12 +0000 (13 14:26 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Jul 2017 12:26:12 +0000 (13 14:26 +0200)
tree8d097a1fdbeb02ab1a28ef8b4df427c3bd3a5aa1
parente07392cf41c08474b6fa2e6a0fae6698e454be2b
parent3315bd11186992e11e7164429f513a41afa9785c
Merge branch 'maint'
lisp/org-capture.el