Merge branch 'maint'
commitec8f3f987ec46044975557a352dd491f107ff60b
authorNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Jun 2013 07:33:39 +0000 (25 09:33 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Tue, 25 Jun 2013 07:33:39 +0000 (25 09:33 +0200)
tree92671645efc1e3feab16f5a80c7f03a0f709ab3b
parentd3ef263895d7bce679bb8cd12992fdc42a4846a2
parent95b16b1aa544f724d716e6d16e722f9f1473f864
Merge branch 'maint'
lisp/ox-odt.el
lisp/ox.el