Merge branch 'maint'
commit5269279bf4b4ab3e12cc8717833893b4ce6064f1
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 14:51:29 +0000 (19 16:51 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 14:51:29 +0000 (19 16:51 +0200)
tree9c383a005c92b1aeb0fe73b94a92772704cfd188
parent016d84fe8ffc310bd44f932a1b13ae658e9ca42b
parentf9f35bc79b55f4243dd0e289653cac7ee8418ea3
Merge branch 'maint'
doc/org.texi