Merge branch 'maint'
commita98a6afe56d37df64485ad8305ef380aa0c381da
authorBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 13:21:31 +0000 (29 15:21 +0200)
committerBastien Guerry <bzg@altern.org>
Tue, 29 Jul 2014 13:21:31 +0000 (29 15:21 +0200)
tree04ac2177ff17f7ac0be420590833439c6c6fb9e0
parent2dbb338ad3144e1b692d619589c966bbfa28d578
parent507244d56b055e7595ba94fe89d45c7ddb2559df
Merge branch 'maint'
lisp/ox-publish.el