Merge branch 'maint'
commit4691033abbe9cbfaac27f4ae6fefeb48d251d13a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Dec 2016 21:14:02 +0000 (13 22:14 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 13 Dec 2016 21:14:02 +0000 (13 22:14 +0100)
tree009b4e6ed377d613bbc28f67c5facf7c154c94a4
parent3322f5edfc0f52cdc28e1591fe8765d9ddcbc315
parent1c957297885140231c65d279708eebdbc2c6342c
Merge branch 'maint'
lisp/ox.el
testing/lisp/test-ox.el