Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Feb 2017 14:37:41 +0000 (15:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 19 Feb 2017 14:37:41 +0000 (15:37 +0100)
1  2 
lisp/org-capture.el

Simple merge