Merge branch 'maint'
commitf620efe1b8621725f29a389fa077d81d8bc3d32e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 10 Feb 2015 21:27:12 +0000 (10 22:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 10 Feb 2015 21:27:12 +0000 (10 22:27 +0100)
tree1688c9e0ed9ba236fd8f8c8638609a2ef18b394b
parenta4083de5c23f88a363838cb89e6cc1feb3d6756e
parent880a2b4f9042e188462c7c6a8996500774c21884
Merge branch 'maint'
lisp/ox-odt.el