Merge branch 'maint'
commite4386ba22a8fc64cfef3419d5f3134ed6b2c901a
authorNicolas Goaziou <n.goaziou@gmail.com>
Wed, 1 Jan 2014 18:02:58 +0000 (1 19:02 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Wed, 1 Jan 2014 18:02:58 +0000 (1 19:02 +0100)
treec4e1aeef0e6a19205716e7325b6d329a063b3ca2
parent4d652d21ae1bab3f3fe203320d511193384f3fcb
parent22c3bb81ff8ce2f359566403f7873e560627eb2d
Merge branch 'maint'
lisp/ox-publish.el