Merge branch 'maint'
commitbd921f0858f28783a33647c30ed4d3d38d94a55f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Nov 2015 10:29:55 +0000 (12 11:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 12 Nov 2015 10:29:55 +0000 (12 11:29 +0100)
treeb8a6940375f77af0d50906204a99b3a470e36189
parentf0a48b9064ee9fd3e569149647bacfbb38de75a4
parent53a4209003642032cdc44daa46c38a73dc8202b0
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el