Merge branch 'maint'
commit32676822de47b533f95abd39ddb9d4a9d50ca52e
authorBastien <bzg@gnu.org>
Thu, 15 Jun 2017 14:50:16 +0000 (15 16:50 +0200)
committerBastien <bzg@gnu.org>
Thu, 15 Jun 2017 14:50:16 +0000 (15 16:50 +0200)
treef56a6385af4ebacd01857f9b25d9828c386c7fa9
parent62ce81413023bee8a14a9dc7c4e9f8d98058eb51
parent01ba5cafa516452f3d69ca2d81be1d2cd74d8d76
Merge branch 'maint'
doc/org.texi