Merge branch 'maint'
commitc01b62305e4bd69a26da9838ce4a86a73f01c92e
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Aug 2017 06:12:29 +0000 (30 08:12 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Aug 2017 06:12:29 +0000 (30 08:12 +0200)
tree654d17a8689936085dd4c547645eea77d095ea0c
parentdaf30f180cbe45c3dbb48abff0679d2aba7c1bb8
parent18a48b5861a6d90e020d4d0b47cb15654e85d7a7
Merge branch 'maint'
lisp/org.el
lisp/ox-odt.el