Merge branch 'maint'
commitb5356dadb4cf886e10203df7c977126d7cd4b7d8
authorNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 16:41:12 +0000 (13 18:41 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sun, 13 Oct 2013 16:41:12 +0000 (13 18:41 +0200)
tree88c8f8be81c6d9708488c939a4ea05f838c14c0c
parentf37f3596a26758760518942098ea4b93b43ecaf2
parent9c1ef6df931e50c80866eae1a8d786aca2611612
Merge branch 'maint'
lisp/ox-publish.el