Merge branch 'maint'
commit411524a31cb4eed637c75bb0ccc34859bab62a82
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 20:38:07 +0000 (22 22:38 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 22 Jun 2016 20:38:07 +0000 (22 22:38 +0200)
tree16dbf7ca8fd4d52d0e279ec0902ad427ff4791be
parente33ca741c0993051d747308d6b39c7d9ec01a8f7
parent2be2a15566782fad60d441582913a1f687b8b74d
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el