Merge branch 'maint'
commit845138473e53e11f4ee0ce4385701ace9ff35337
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 5 Sep 2017 20:34:38 +0000 (5 22:34 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 5 Sep 2017 20:34:38 +0000 (5 22:34 +0200)
tree9a7f590e010107abcfae1c29899e845b481143ae
parentdd490b431bf47edf10424c968ec91ae93ae7f2f2
parent0a77f042ea2bd803b5575720289b238d11eeeb84
Merge branch 'maint'
lisp/ox-odt.el