Merge branch 'maint'
commit400d46e547d265623e8af75dc436b67526def04c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Jan 2017 14:28:33 +0000 (12 15:28 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Jan 2017 14:28:33 +0000 (12 15:28 +0100)
treeda4721f544385d1b3a6d7c7ef4586b75f25c0dc8
parent343417bcdb630d4ac1bfd481c8aeb0da47db3199
parent1749dfe091308d33799de20fb839cb3604afacc2
Merge branch 'maint'
lisp/ox-odt.el