Merge branch 'maint'
commit588ec5312414a5958163f98a8c8eabc2f2c27545
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 4 Nov 2014 21:25:18 +0000 (4 22:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 4 Nov 2014 21:25:18 +0000 (4 22:25 +0100)
tree38ea55247a5177b952da7602f9ee438439f365ed
parent5bc289df21e982b5813a04be1d9d77fee2f6e87b
parentf8d7da4c33729296d2a38bcb4ccaaabfe01dd121
Merge branch 'maint'
lisp/ox-publish.el