Merge branch 'maint'
commit0491ae52045c8f55a8e47fd1111f07f343479686
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Sep 2014 23:06:22 +0000 (20 01:06 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Sep 2014 23:06:22 +0000 (20 01:06 +0200)
treea10e769ebbced6e8815e2c177a9e1207e5044524
parent14652299573e7e6bdd34a20d7da31c2519f68ebe
parent1b17e8c8da3b8edede1a34559fac0dfedbaf5e6c
Merge branch 'maint'
lisp/ox-ascii.el