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

diff --cc lisp/ox-odt.el
Simple merge