Merge branch 'maint'
commit83f5c8962fa477baa993214aea4ffd1ffdef8a79
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 11:59:45 +0000 (23 12:59 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 11:59:45 +0000 (23 12:59 +0100)
treef254ec4c1a759237237f680cbe98d179f7661d7b
parent9263bf5766e23b1e0febca55f6acce1d9666773d
parentda80e6c6abb9ac1aca1997bf691648e0a56aa6d8
Merge branch 'maint'
lisp/org-capture.el