Merge branch 'maint'
commit0c75ce3034af241b00ddeb1427026ef113d02cce
authorBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 13:56:50 +0000 (6 14:56 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 6 Jan 2013 13:56:50 +0000 (6 14:56 +0100)
tree6355b303c316c53dcfebd40879e0fd1941bc9e85
parent8c5b47935fd10ce692e86819b328c2f6866e658e
parent76684b5606e5930612ce9df24f97041004a19298
Merge branch 'maint'
doc/org.texi