Merge branch 'maint'
commit09e61233ed5a24687e20b7dc18a1c985d423fb24
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 25 Jun 2017 21:09:41 +0000 (25 23:09 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 25 Jun 2017 21:09:41 +0000 (25 23:09 +0200)
tree7ae723cd0f088ee7d0631d51fe79bba6cf69052a
parentd9344b9ad674f567829864364a973bf452a948f0
parent7b065b1d0a0811304a7599b9feb1c239df1a48db
Merge branch 'maint'
lisp/ox-odt.el