Merge branch 'maint'
commit602a1a21fccd65b0fa5dc9543a9865b6537a75b9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 30 Jun 2017 12:36:30 +0000 (30 14:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 30 Jun 2017 12:36:30 +0000 (30 14:36 +0200)
treecca907df980f9529edee013afbc0c2a6909274a0
parent9ed5674dcba25542166d8d27c56505f3377075c0
parent4f90f44af3573d7168535adde4625cac484df237
Merge branch 'maint'
lisp/org-capture.el