Merge branch 'maint'
commit6ef2bd0ef072ca59be10f6c4cb7926a3e3caf215
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 16 Jan 2014 15:24:15 +0000 (16 16:24 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 16 Jan 2014 15:24:15 +0000 (16 16:24 +0100)
tree630d039066dec25254b4f14fef2cd2c4ef47da45
parentd99ffcf954f7087da3d4d42ece13c5b14dad4465
parentb7c1014353241d8cfe1bfe8094a8932da37860d6
Merge branch 'maint'
lisp/ox-ascii.el