Merge branch 'maint'
commit2c5c68dec53bcdc5119614e539f72d1ef9a06765
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 13 Jan 2017 23:25:24 +0000 (14 00:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 13 Jan 2017 23:25:24 +0000 (14 00:25 +0100)
tree0543cfa5af8aa0347aa9d47e1683ebb825bea214
parent658260452701a5326e1399938da339d18c9c756b
parent88486fdce0b5fe69d26c712798f95be00e3c6a46
Merge branch 'maint'
doc/org.texi