Merge branch 'maint'
commit7e903acccdadcaebff16bc7fdfd4e89482c6632b
authorBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 19:02:48 +0000 (16 20:02 +0100)
committerBastien Guerry <bzg@altern.org>
Fri, 16 Mar 2012 19:02:48 +0000 (16 20:02 +0100)
treedab13dcf281f2e802572efac1b6c9317066040dd
parent95e318ae0688f9ca2b08cd1b37b19d6eb9ec6dc6
parente85080bb2b50ec8708d1077048e7ba2f8a6ed30a
Merge branch 'maint'
doc/org.texi