Merge branch 'maint'
commit52ba1a27ad7ba917afc3a0d16f5c1b86f9c8d8ed
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Apr 2018 21:03:01 +0000 (11 23:03 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Apr 2018 21:03:01 +0000 (11 23:03 +0200)
tree160b0e6d838ee2eaa94c35ae607a7a3572a20091
parent384d7634473bbe89ef41cb85d1d372d14ce292f8
parentd20fc4d7c5973e2c07feb321f959471d946aff57
Merge branch 'maint'
lisp/org-capture.el