Merge branch 'maint'
commit3375671e838ed4bfe9bec1ea233b340fa2d16646
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:45:46 +0000 (12 01:45 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 12 Nov 2016 00:45:46 +0000 (12 01:45 +0100)
treee1f430294d8b637aa1246782731b76b214a6b83c
parent6340a78c9fabfda8bb4d1fba28a3ca0213b8f742
parentff0748beacf3cf6369732ef10d56691ac9545d38
Merge branch 'maint'
doc/org.texi