Merge branch 'maint'
commit8548dfa33f2ea00d92044374258d762a8e1ea9d1
authorBastien <bzg@gnu.org>
Tue, 20 Mar 2018 11:38:31 +0000 (20 12:38 +0100)
committerBastien <bzg@gnu.org>
Tue, 20 Mar 2018 11:38:31 +0000 (20 12:38 +0100)
treef015a47264ac378927da654e90f934b9ad499006
parenta06b72bb9dc829cca43febc20baac88df535708c
parentb2d3dbabf7b4544927c1dc58790d31e2d196f2cb
Merge branch 'maint'
lisp/org-capture.el