Merge branch 'maint'
commit56b47fb71d1c01762ffe8c34bf750df554e2805b
authorNicolas Goaziou <n.goaziou@gmail.com>
Sat, 24 May 2014 13:46:04 +0000 (24 15:46 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Sat, 24 May 2014 13:46:04 +0000 (24 15:46 +0200)
tree5aa8248f1c3984082b6d9de76b43a706b7442a92
parenta72d2e5d5d773cb771b89abd00839a766eedbcff
parente3d2c1b0c96cf07562fafb49237210bcab26bd96
Merge branch 'maint'
lisp/ox-ascii.el