Merge branch 'maint'
commit0865cbb67488b05b6fccde4baafc4a6f5087bbbf
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 11 Apr 2015 11:47:40 +0000 (11 13:47 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 11 Apr 2015 11:47:40 +0000 (11 13:47 +0200)
tree6e3ddf97fba6a92854d16f2de47270256c80c9ec
parent9debffbe0f1c10e33514073264d2d5462c1fa0f8
parentc000e87888d29c70502083915223f4443f7ce09a
Merge branch 'maint'
doc/org.texi