Merge branch 'maint'
commitafa759f27c042caf4e4c9266d55f6c4c6ec01ffa
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Jun 2014 10:18:35 +0000 (26 12:18 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 26 Jun 2014 10:18:35 +0000 (26 12:18 +0200)
tree8fb61d06c4ee379d3c5b9592e8a7d918e2cc8248
parentd5bc5859af7d263d71e3b38b08b8f794cb05de40
parenta5beff869fa198450ac68b8d3cad1e79089ff75c
Merge branch 'maint'
lisp/ox-ascii.el