Merge branch 'maint'
commiteb234d2b458b1f791b051f04e2904ab7866b60cc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:57:45 +0000 (8 23:57 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:57:45 +0000 (8 23:57 +0200)
tree884b0f17a9e85829b845e5164046f63e9f4a0ab8
parentaf62e8525c0ac7ec20330c1586e8cccd177bc460
parent85bfda77edfd8561d9c59219dc791014bb73ad5e
Merge branch 'maint'
doc/org.texi