Merge branch 'maint'
commit10dc237eeed2385c6e8a78935f779665b49e9e2f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 14 Mar 2017 17:14:32 +0000 (14 18:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 14 Mar 2017 17:14:32 +0000 (14 18:14 +0100)
treeb893f218766b4bd11a88d63f2932e5b9f9d2ecaa
parentc41c2be33902123a6e7718df7b53ba3229c7593d
parent6cd42b08f9347a8d6084ec23548b754f9e02b2a1
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el