Merge branch 'maint'
commit05223fc6fa68d7677412d4b79ea6f59a113deaf1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 12 Dec 2016 20:25:28 +0000 (12 21:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 12 Dec 2016 20:25:28 +0000 (12 21:25 +0100)
tree9709b638411d2bc24d8b22072fc9d92ce71ae387
parent091f10313a0c572236b7a7479e151e0ff2835d6c
parentb09d161873fccc2b79e2f309319accf6a668800e
Merge branch 'maint'
doc/org.texi