Merge branch 'maint'
commit1dfdb8193251ebf3a5e38834ccd5c04204159c5d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 18:04:42 +0000 (17 20:04 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 18:04:42 +0000 (17 20:04 +0200)
tree329299b9d1ee6dd817eb453fefb6aef93220e065
parentea3754f1685a649c2748b96ca16e20dd20fef9b4
parent68f60dbdd54eff36efcc1cd6232b03617c57c96f
Merge branch 'maint'
lisp/org-capture.el