Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 10:13:09 +0000 (12:13 +0200)
committerBastien Guerry <bzg@altern.org>
Wed, 10 Jul 2013 10:13:09 +0000 (12:13 +0200)
commit044c8c5ebb903dc4a83846c9d2290b0611eaefdf
tree375ca22a0c17d1e0ee919cf6769798f462f881e7
parente29a4703c7ee864482006f37f5f32a13d5d58d3d
parent681bd0cfd9ede85ed827c354c76637ea49105c52
Merge branch 'maint'
lisp/ox-odt.el