Merge branch 'maint'
commitdb0377ddc68e9cd1835becefa61da4bbb2407ea4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:09:33 +0000 (19 23:09 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:09:33 +0000 (19 23:09 +0100)
tree959edd3fb9b1f9b453ab08f8c2640977267341cb
parentbc0bebbc43d77e83fbe79671b519b46f271a64c3
parentc3c33841ebb2e63867be83a4ce589505cccb64c4
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el