Merge branch 'maint'
commit5edc17ef73fc1130ef97a9071584f91223507908
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 Jan 2017 21:52:43 +0000 (31 22:52 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 31 Jan 2017 21:52:43 +0000 (31 22:52 +0100)
treed50baa927f151e5a8ba0fd59f754752ff805cf01
parent6b30deaae97cf276e9f0698644ab0eb7155624c4
parent426bce6a8343d886b8fadeeb2cda86abd53bf37a
Merge branch 'maint'
lisp/org-capture.el