Merge branch 'maint'
commit235d3c5e45716eb4ff23d3790ff0676d8ac4f335
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Jan 2017 10:58:51 +0000 (11 11:58 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Jan 2017 10:58:51 +0000 (11 11:58 +0100)
tree79f4f0a4440a6b53961c2956b9e396b39941621c
parent7404e3d22a3a7705d04a180f3f659f63266c9384
parent71890398cd22c198d502949834b0296fbf7beebb
Merge branch 'maint'
lisp/org-capture.el