Merge branch 'maint'
commit88cc2a422dc44a56f10bdd9f7b2cf9a97354bae4
authorBastien <bzg@gnu.org>
Tue, 18 Aug 2015 16:02:57 +0000 (18 18:02 +0200)
committerBastien <bzg@gnu.org>
Tue, 18 Aug 2015 16:02:57 +0000 (18 18:02 +0200)
treee68f1c84c615d3344738c8a142a281aa35b471f5
parentafa64d6f101ff765d3c4471c24111987960fb88e
parentffbf9119cd74bf380012e13b460e2863aeb00507
Merge branch 'maint'
doc/org.texi