Merge branch 'maint'
commita9da9c655094986d35297bf13e88f90d566deef0
authorBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:58:33 +0000 (23 14:58 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 23 Jan 2013 13:58:33 +0000 (23 14:58 +0100)
tree313267eda2cd4f0db94f7d2b5dd8af2f60952978
parentdddd9fb4af58e1cc6760ee4a2d3b3408f2f25c0e
parenta7c0ea1a86a694468e852e927193e2c8727f5fcb
Merge branch 'maint'
doc/org.texi