Merge branch 'maint'
commit010d105b044e522f704bd4c42a7b69b7e07c7d7a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 24 Jul 2014 13:01:25 +0000 (24 15:01 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 24 Jul 2014 13:01:25 +0000 (24 15:01 +0200)
tree905cfd0cd826db083daf107eecf24eb7674cd230
parentdb0130468bfea30755faa329e506f021d375cca6
parent776972cfe83ef79fd76dee79398351797f8cf9ff
Merge branch 'maint'
lisp/ox-odt.el