Merge branch 'maint'
commit46db5623ae5176e651487f03018fd62030296380
authorBastien Guerry <bzg@altern.org>
Thu, 14 Nov 2013 08:55:36 +0000 (14 09:55 +0100)
committerBastien Guerry <bzg@altern.org>
Thu, 14 Nov 2013 08:55:36 +0000 (14 09:55 +0100)
tree3588e41f958e9888a97209c04c48cc82aac6de73
parenta30567a1148721c410d46a2d0ce43aa68b9fedee
parent8c5406d9620216fe703fe282f1a7b1ce94f52427
Merge branch 'maint'
lisp/ox-odt.el