Merge branch 'maint'
commit51194312e4b79ce5dc069fb8cf934c9810bfe2b0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Dec 2015 23:29:52 +0000 (31 00:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Dec 2015 23:29:52 +0000 (31 00:29 +0100)
tree4658c4a81fd039be481ab2c79aa391b98b25b839
parent800ce62ad240b1e18e57af0c546f3826c5e5b6e6
parent0c14fa649950b905be42c46e751e42633442b9cb
Merge branch 'maint'
lisp/ox-publish.el