Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 23 Aug 2017 08:30:33 +0000 (10:30 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 23 Aug 2017 08:30:33 +0000 (10:30 +0200)
1  2 
lisp/org-capture.el

Simple merge