Merge branch 'maint'
commit86dcd907719c97530a266686694a7dc7bd25449a
authorBastien <bzg@gnu.org>
Wed, 29 Apr 2015 05:57:07 +0000 (29 07:57 +0200)
committerBastien <bzg@gnu.org>
Wed, 29 Apr 2015 05:57:07 +0000 (29 07:57 +0200)
tree70df53d8b4ab4c135a0961d6f22a62466dec7e8f
parent2e2f68467c4da2928b9b42b89f0ff164bb4b8722
parent8cc7b72160b2214311526aa072175d580e648aff
Merge branch 'maint'
doc/org.texi
lisp/ox-ascii.el