Merge branch 'maint'
commitb7710ddcbde78e20508ee1aa3b5f2fc954bddacb
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 26 Jun 2013 07:45:10 +0000 (26 09:45 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 26 Jun 2013 07:45:10 +0000 (26 09:45 +0200)
tree9a8e8cd7a313fecc6985b65583d000dcf47fb50c
parent685b2967247597f75d22cb77896bc8a70503b2c3
parentd7f9f9da569662cf52d99aba271ac47ddabbaa10
Merge branch 'maint'
lisp/ox-odt.el