Merge branch 'maint'
commitf3b2b74baf2f6ef48718e48304af517567a22d70
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 27 Sep 2014 12:58:51 +0000 (27 14:58 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 27 Sep 2014 12:58:51 +0000 (27 14:58 +0200)
tree3009dbc4b87cb2aa9923431a3b6c90c89b12b193
parent45a00a4d82d66eee6d309eb16f78fa4bea6d264d
parentd2ecbe637a3abe234af4a974c1dd52e3da5a1924
Merge branch 'maint'
lisp/ox-ascii.el