Merge branch 'maint'
commit17c3091f15e4cc40d0b1d8e330dac7c39a485ba4
authorBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:09:59 +0000 (4 18:09 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 4 Jan 2014 17:09:59 +0000 (4 18:09 +0100)
tree77be0c77b53845e7d96cc072018076bd7f139231
parent09653647074c1f694b2eefeb3cf24abd4e12151e
parentb8a495d2ed49a2b5e8f8837f6523beefd219f6d1
Merge branch 'maint'
lisp/ox-odt.el