Merge branch 'maint'
commitce748a7ed5fd7b9b57c0a0e8cdcc65a28c8ee06a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 26 Apr 2016 16:47:43 +0000 (26 18:47 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 26 Apr 2016 16:47:43 +0000 (26 18:47 +0200)
treeb9d74af7fa7811ec0fc09d3b9c36880c8373b02d
parentda4db33132e83ed1b2cd4b8704d1865890f6f257
parent91ea3920df85f530a31a80d6ed300d318261aeee
Merge branch 'maint'
lisp/ox-ascii.el