Merge branch 'maint'
commita67ed0f59d42ffc688820571f64104aeb534722e
authorNicolas Goaziou <n.goaziou@gmail.com>
Mon, 15 Oct 2012 19:33:44 +0000 (15 21:33 +0200)
committerNicolas Goaziou <n.goaziou@gmail.com>
Mon, 15 Oct 2012 19:33:44 +0000 (15 21:33 +0200)
tree5154df754c13e8af3a100cceb750781332233514
parent6fae77a8d6c33199eb66666f51e507ba981622a8
parent633d66d7c4a4d1406598cbf837254537fa6c1ab4
Merge branch 'maint'
doc/org.texi