Merge branch 'maint'
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 2 Sep 2014 12:56:16 +0000 (14:56 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 2 Sep 2014 12:56:16 +0000 (14:56 +0200)
commitd4e4b1ea68e9dc493fe99a09085008b68d1885cb
treedf791f1f7460960d3441e1e6b263501755c6abd4
parentaaa70b90ef1395e1469e3c3ad94d7e390eeb944c
parent51f2730d7f0b069f5c6400f4d10c9a7f04cac550
Merge branch 'maint'
doc/org.texi