Merge branch 'maint'
commitf4455f4902324d1b53d048960a2995c7b01d3863
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 09:21:56 +0000 (25 11:21 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 25 Jul 2014 09:21:56 +0000 (25 11:21 +0200)
treef353a3f056f30e416c41bf36f97e933e388cc509
parentced4fa3205ec99fbc63d7e3420b49d9ffd885056
parent43a8b979f8245bed276cc6142e38141a3055c0b0
Merge branch 'maint'
lisp/ox-odt.el