Merge branch 'maint'
commita023b31e484300a53bc0b7d8c34c977b5c0fa167
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 23 May 2017 16:15:42 +0000 (23 18:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 23 May 2017 16:15:42 +0000 (23 18:15 +0200)
tree7d29f93aaca433374fe73334968fa7c377865896
parentb3497fdeb6998ba1eb4d6e2d5f3d32bf4a21d1e5
parentd6f096546e795430844098af85c3ed703b1597e2
Merge branch 'maint'
lisp/org-capture.el