Merge branch 'maint'
commit716bc4874422befb0cb27f016a2bca56c8eb1351
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 17 May 2014 08:16:33 +0000 (17 10:16 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 17 May 2014 08:16:33 +0000 (17 10:16 +0200)
tree09cc5866799468b896eb0c9c0d5649b1362bce2d
parent49ef55bd651e9afb44130bb8e2bcafad9b9e26cc
parentb11b4a5c1a0a7e1205e4c2a65e2b0173fc4c7520
Merge branch 'maint'
lisp/ox-ascii.el