Merge branch 'maint'
commit89f5ad36d725792c8e532ea3a140c439dc91bc0f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 12 Oct 2014 20:55:38 +0000 (12 22:55 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 12 Oct 2014 20:55:38 +0000 (12 22:55 +0200)
tree11d93b4c08dea74db6f16b26c1f694a402999cfc
parentbc9a582f1edd2ba29560b3021265f830c479386b
parenta0ac1344fccc391abda4e5f5088a399e511b3607
Merge branch 'maint'
lisp/ox-publish.el
lisp/ox.el