Merge branch 'maint'
commitaff4f10d798a601d48aeca6be2b369874e8ca04a
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Oct 2013 17:04:49 +0000 (23 19:04 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 23 Oct 2013 17:04:49 +0000 (23 19:04 +0200)
treecbed4814fa44cdcfd7812ac847965e6b629d37b5
parentf3ae90c6c53080a2a77a0c3079263de8c57104e2
parenta535d291fd2f221194abd19ca1bf664d2c782e8b
Merge branch 'maint'
lisp/ox-odt.el