Merge branch 'maint'
commit658260452701a5326e1399938da339d18c9c756b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 13 Jan 2017 09:36:56 +0000 (13 10:36 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 13 Jan 2017 09:36:56 +0000 (13 10:36 +0100)
tree790e6ade66984b8d005ce26f15fc759acd86d6a7
parent5bd340fd4e37005ab79afb6e7638823adb1bdecf
parentc394c8f58adcb5d7d42075d8fd99969ead5ac927
Merge branch 'maint'
doc/org.texi