Merge branch 'maint'
commitaf62e8525c0ac7ec20330c1586e8cccd177bc460
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:51:50 +0000 (8 23:51 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 8 Aug 2014 21:51:50 +0000 (8 23:51 +0200)
tree57308783601f67f396f60376269a16ca9a3077f0
parentd7c4f9e4e680756d3c88ca8fae2d2bb360d270d6
parent7bc6038ea20094aa4167aa316f4af652e75be0f4
Merge branch 'maint'
doc/org.texi