Merge branch 'maint'
commit698f020be113cdc05cec0ea5d74b8ae7f08b26e0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 09:29:48 +0000 (17 11:29 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 17 Apr 2017 09:29:48 +0000 (17 11:29 +0200)
tree32023991ec0cdca95ac8f9d2b9b7c2404216cc8c
parent6c1aaff5cea2af0e024d2425d6c1153e9e0c038a
parent166364bc96e515c301f0dce9005cd010599d31c2
Merge branch 'maint'
contrib/lisp/ox-confluence.el