Merge branch 'maint'
commita51c6ffa532a3f40a1d5c9a77788926397fedf78
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Jan 2017 20:01:40 +0000 (11 21:01 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 11 Jan 2017 20:01:40 +0000 (11 21:01 +0100)
treed1c20299e74f73fce0580b017b953e1bfc0d7fac
parent1faf5757e9aade1c0233592c58d3667f4077ff9e
parent909a04e011a8c86bdce41e83de806024f1235089
Merge branch 'maint'
lisp/ox.el