Merge branch 'maint'
commitf261833a2656239de4bce856ffb79f008bace825
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Mar 2014 13:42:08 +0000 (29 14:42 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 29 Mar 2014 13:42:08 +0000 (29 14:42 +0100)
tree7d9fc9a39bec986ff5dd210d2ef5e718127bc378
parent74c02411460499db47ff5a4b40f1b60a7311708c
parent3636783ca440c1f4aaa5e2db7bc431f0223e1592
Merge branch 'maint'
lisp/ox-publish.el