Merge branch 'maint'
commit2e615798a1981aabee59a3230cc24d71993a3a76
authorBastien Guerry <bzg@altern.org>
Sat, 18 Feb 2012 17:21:41 +0000 (18 18:21 +0100)
committerBastien Guerry <bzg@altern.org>
Sat, 18 Feb 2012 17:21:41 +0000 (18 18:21 +0100)
treeb811b426f8275c747319a8caa71ebebeb431c4cc
parentf1e5dfdbe95d3349602fc14daae90c1b4fbdc78e
parent40b3b323f879c987376cb4c039b22e01eb07ec15
Merge branch 'maint'
doc/org.texi