Merge branch 'maint'
commit4c9d3753cb79140fbb9d15ad611fa49afe539266
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:41:20 +0000 (8 23:41 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:41:20 +0000 (8 23:41 +0200)
tree77f73305f29bb39e9ec5699f9e1145b1b8439714
parent1212769ed589f91378115333480d036aa4ad5d9f
parente5aceea83c85626c68becc1a9557c077006a4637
Merge branch 'maint'
doc/org.texi